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

This commit is contained in:
Roan Kattouw 2012-02-22 21:43:59 +00:00
parent 81812fe2d7
commit 1afbfbfaa9
2 changed files with 2 additions and 1 deletions

View file

@ -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

View file

@ -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() );