From: Aryeh Gregor Date: Thu, 13 Dec 2007 23:35:34 +0000 (+0000) Subject: * (bug 10184) Extensions' stylesheets and scripts should be loaded before user-custom... X-Git-Tag: 1.31.0-rc.0~50433 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=12fad27007e7c9c4fa482818cf04a6c13a92c39d;p=lhc%2Fweb%2Fwiklou.git * (bug 10184) Extensions' stylesheets and scripts should be loaded before user-customized ones (like Common.css, Common.js). Tested a bunch of built-in scripts (AJAX watch, preferences) and some enwiki scripts and it all worked perfectly. Thanks to darklama/darkcode for pointing out the ludicrous bug in my previous commit that broke everything. --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8adae172cf..7f0dbd8ffa 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -229,7 +229,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 12148) Text highlight wasn't applied to cleanly deleted and added lines in diff output * (bug 10166) Fix a PHP warning in Language::getMagic -* Only mark rollback edits as minor if the user can normally mark edits as minor. +* Only mark rollback edits as minor if the user can normally mark edits minor * Escape page names in the move successful page (e.g. for pages with two apostrophes). * (bug 12145) Add localized names of kk-variants @@ -237,7 +237,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Set proper page title for successful file deletion * (bug 11221) Do not show 'Compare selected versions' button for a history page with one revision only -* (bug 12267) Set the default date format to Thai solar calender for the Thai language +* (bug 12267) Set the default date format to Thai solar calender for the Thai + language +* (bug 10184) Extensions' stylesheets and scripts should be loaded before + user-customized ones (like Common.css, Common.js) == Parser changes in 1.12 == diff --git a/skins/MonoBook.php b/skins/MonoBook.php index d0148a701f..b47e81e552 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -71,6 +71,8 @@ class MonoBookTemplate extends QuickTemplate { data ); ?> + +html('headscripts') ?> data['jsvarurl' ]) { ?> @@ -87,8 +89,6 @@ class MonoBookTemplate extends QuickTemplate { data['trackbackhtml']) print $this->data['trackbackhtml']; ?> - -html('headscripts') ?> data['body_ondblclick']) { ?>ondblclick="text('body_ondblclick') ?>" data['body_onload' ]) { ?>onload="text('body_onload') ?>"