https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112152
Revision: 112152
Author: catrope
Date: 2012-02-22 21:43:59 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
(bug 34600) Older skins using useHeadElement=false were broken in 1.18 .
Modified patch by Vitaliy Flippov
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/SkinTemplate.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2012-02-22 21:24:10 UTC (rev 112151)
+++ trunk/phase3/RELEASE-NOTES-1.19 2012-02-22 21:43:59 UTC (rev 112152)
@@ -248,6 +248,7 @@
* (bug 31676) Group dynamically inserted CSS into a single <style> tag, to work
around a bug where not all styles were applied in Internet Explorer
* (bug 28936, bug 5280) Broken or invalid titles can't be removed from
watchlist.
+* (bug 34600) Older skins using useHeadElement=false were broken in 1.18
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2012-02-22 21:24:10 UTC (rev
112151)
+++ trunk/phase3/includes/SkinTemplate.php 2012-02-22 21:43:59 UTC (rev
112152)
@@ -460,7 +460,7 @@
if ( $this->useHeadElement ) {
$tpl->set( 'headelement', $out->headElement( $this ) );
} else {
- $tpl->set( 'headscripts', $out->getScript() );
+ $tpl->set( 'headscripts', $out->getHeadScripts() .
$out->getHeadItems() );
}
$tpl->set( 'debughtml', $this->generateDebugHTML() );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
