r28455 - Code Review

From MediaWiki.org

Jump to: navigation, search
Repository:MediaWiki
Revision:r28454 | r28455 (on ViewVC) | r28456 >
Date:23:35, 13 December 2007
Author:simetrical
Status:ok
Tags:
Comment:* (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.
Modified paths:

Diff [purge]

Index: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php	(revision 28454)
+++ trunk/phase3/skins/MonoBook.php	(revision 28455)
@@ -71,6 +71,8 @@
 		<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
                 
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
+		<!-- Head Scripts -->
+<?php $this->html('headscripts') ?>
 <?php	if($this->data['jsvarurl'  ]) { ?>
 		<script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"><!-- site js --></script>
 <?php	} ?>
@@ -87,8 +89,6 @@
 		<script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
 <?php	}
 		if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-		<!-- Head Scripts -->
-<?php $this->html('headscripts') ?>
 	</head>
 <body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload'    ]) { ?>onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	(revision 28454)
+++ trunk/phase3/RELEASE-NOTES	(revision 28455)
@@ -229,7 +229,7 @@
 * (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 @@
 * 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 ==
 
Views
Toolbox