r112152 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112151‎ | r112152 | r112153 >
Date:21:43, 22 February 2012
Author:catrope
Status:ok
Tags:
Comment:
(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 (modified) (history)
  • /trunk/phase3/includes/SkinTemplate.php (modified) (history)

Diff [purge]

Index: trunk/phase3/RELEASE-NOTES-1.19
@@ -248,6 +248,7 @@
249249 * (bug 31676) Group dynamically inserted CSS into a single <style> tag, to work
250250 around a bug where not all styles were applied in Internet Explorer
251251 * (bug 28936, bug 5280) Broken or invalid titles can't be removed from watchlist.
 252+* (bug 34600) Older skins using useHeadElement=false were broken in 1.18
252253
253254 === API changes in 1.19 ===
254255 * Made action=edit less likely to return "unknownerror", by returning the actual error
Index: trunk/phase3/includes/SkinTemplate.php
@@ -460,7 +460,7 @@
461461 if ( $this->useHeadElement ) {
462462 $tpl->set( 'headelement', $out->headElement( $this ) );
463463 } else {
464 - $tpl->set( 'headscripts', $out->getScript() );
 464+ $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
465465 }
466466
467467 $tpl->set( 'debughtml', $this->generateDebugHTML() );

Follow-up revisions

RevisionCommit summaryAuthorDate
r112162Merged revision r112034, r112037, r112100, r112141, r112152 from trunk/phase3reedy23:24, 22 February 2012
r112637MFT r111380, r111809, r111983, r112034, r112037, r112152reedy21:02, 28 February 2012

Status & tagging log