From 1afbfbfaa96b2921936b73fe5e4a38dd2a45df51 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 22 Feb 2012 21:43:59 +0000
Subject: [PATCH] (bug 34600) Older skins using useHeadElement=false were
 broken in 1.18 . Modified patch by Vitaliy Flippov

---
 RELEASE-NOTES-1.19        | 1 +
 includes/SkinTemplate.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index b23bedc16f..77b56a293e 100644
--- 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 b96fe77d7a..1a933dda4f 100644
--- 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() );
-- 
2.20.1