diff options
| author | Roan Kattouw <catrope@users.mediawiki.org> | 2012-02-22 21:43:59 +0000 |
|---|---|---|
| committer | Roan Kattouw <catrope@users.mediawiki.org> | 2012-02-22 21:43:59 +0000 |
| commit | 1afbfbfaa96b2921936b73fe5e4a38dd2a45df51 (patch) | |
| tree | 4622981960444ba0ee9391f96f9462dc59ab8889 /includes/SkinTemplate.php | |
| parent | 81812fe2d7c7a6b799b978188c1ae44f6356922c (diff) | |
| download | mediawikicore-1afbfbfaa96b2921936b73fe5e4a38dd2a45df51.tar.gz mediawikicore-1afbfbfaa96b2921936b73fe5e4a38dd2a45df51.zip | |
(bug 34600) Older skins using useHeadElement=false were broken in 1.18 . Modified patch by Vitaliy Flippov
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/112152
Diffstat (limited to 'includes/SkinTemplate.php')
| -rw-r--r-- | includes/SkinTemplate.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index b96fe77d7a06..1a933dda4f92 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() ); |