From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 4 Apr 2006 02:22:14 +0000 (+0000)
Subject: * (bug 5355) Include skin name and style JS settings in page source;
X-Git-Tag: 1.6.0~49
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=9b02a35f39e277155f7523cd0455c0386048f659;p=lhc%2Fweb%2Fwiklou.git

* (bug 5355) Include skin name and style JS settings in page source;
  fixes regression where Opera 6/7 and KHTML CSS fixes weren't applied
  when wikibits.js was moved up before user JS inclusion.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d8432a8c0..287363db5f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -734,6 +734,9 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 5410) Use namespace name when a custom namespace's nstab-NS message is nonexistent
 * (bug 5432) Fix inconsistencies in cookie names when using table prefixes
 * Additional protections against HTML breakage in table parsing
+* (bug 5355) Include skin name and style JS settings in page source;
+  fixes regression where Opera 6/7 and KHTML CSS fixes weren't applied
+  when wikibits.js was moved up before user JS inclusion.
 
 
 === Caveats ===
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index f4f89dc63f..79396541ff 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -64,6 +64,7 @@ class MonoBookTemplate extends QuickTemplate {
 		<!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?1";</style><![endif]-->
 		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
 		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+		<script type="<?php $this->text('jsmimetype') ?>">var skin = '<?php $this->text('skinname')?>';var stylepath = '<?php $this->text('stylepath')?>';</script>
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js"><!-- wikibits js --></script>
 <?php	if($this->data['jsvarurl'  ]) { ?>
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
diff --git a/skins/chick/main.css b/skins/chick/main.css
old mode 100755
new mode 100644