From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 16 Mar 2006 23:41:37 +0000 (+0000)
Subject: * (bug 5236) Load wikibits.js before site-customized javascript
X-Git-Tag: 1.6.0~196
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=74415ccadeb5e6627875a7abc09ea987c12adb53;p=lhc%2Fweb%2Fwiklou.git

* (bug 5236) Load wikibits.js before site-customized javascript
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4e64a8b0ac..4aecab8139 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -692,6 +692,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 5270) Fix broken linktrail for br, cv, fr, hr, nn, oc, ta, wa
 * Add a clickable contribs link in user tool links (rc, watchlist, diff view)
   to see how people like it. (There was one in the old hacked-up diff view.)
+* (bug 5236) Load wikibits.js before site-customized javascript
 
 
 === Caveats ===
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 82027097fc..72b6006ccc 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -65,10 +65,10 @@ 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') ?>" 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>
 <?php	} ?>
-		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js"><!-- wikibits js --></script>
 <?php	if($this->data['pagecss'   ]) { ?>
 		<style type="text/css"><?php $this->html('pagecss'   ) ?></style>
 <?php	}
diff --git a/skins/MonoBook.tpl b/skins/MonoBook.tpl
index 07b2822d23..033999e38c 100644
--- a/skins/MonoBook.tpl
+++ b/skins/MonoBook.tpl
@@ -13,8 +13,8 @@
 	<!--[if IE 7]><style type="text/css">@import "{~ stylepath}/{~ stylename}/IE70Fixes.css?1";</style><![endif]-->
 	<!--[if lt IE 7]><script type="{jsmimetype}" src="{~ stylepath}/common/IEFixes.js"></script>
 	<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-	{if jsvarurl {<script type="{jsmimetype}" src="{jsvarurl}"><!-- site js --></script>}}
 	<script type="{jsmimetype}" src="{~ stylepath}/common/wikibits.js"><!-- wikibits js --></script>
+	{if jsvarurl {<script type="{jsmimetype}" src="{jsvarurl}"><!-- site js --></script>}}
 	{if pagecss {<style type="text/css">{pagecss}</style>}}
 	{usercss}
 	{sitecss}
diff --git a/skins/disabled/HTMLDump.php b/skins/disabled/HTMLDump.php
index 792f4a65ea..20ec01e386 100644
--- a/skins/disabled/HTMLDump.php
+++ b/skins/disabled/HTMLDump.php
@@ -114,11 +114,11 @@ class HTMLDumpTemplate extends QuickTemplate {
     <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
     <!--[if IE]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <?php if($this->data['jsvarurl'  ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
     <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js"></script>
     <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/htmldump/md5.js"></script>
     <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/htmldump/utf8.js"></script>
     <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/htmldump/lookup.js"></script>
+    <?php if($this->data['jsvarurl'  ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
     <?php if($this->data['pagecss'   ]) { ?><style type="text/css"><?php              $this->html('pagecss'   ) ?></style><?php    } ?>
     <?php if($this->data['usercss'   ]) { ?><style type="text/css"><?php              $this->html('usercss'   ) ?></style><?php    } ?>
     <?php if($this->data['userjs'    ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs'    ) ?>"></script><?php } ?>