(bug 34600) Older skins using useHeadElement=false were broken in 1.18 . Modified...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index b23bedc..77b56a2 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -248,6 +248,7 @@ production.
 * (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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index b96fe77..1a933dd 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -460,7 +460,7 @@ class SkinTemplate extends Skin {
                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() );