From c53ccc605f1128eefebda9378116fd18223b1ec2 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Thu, 6 Jan 2011 16:58:29 +0000 Subject: [PATCH] Fix bug 26570 (user CSS preview broken) and bug 26555 (styles added with $out->addStyle() are loaded after site/user CSS) Did this by moving RL generation from getHeadLinks() to buildCssLinks() (Trevor did this earlier), but did it right this time: * Updated callers for buildCssLinks() parameter list change so stuff doesn't explode * Considered making buildCssLinks() tolerant of a missing $sk parameter, but decided against this: it's not used in SVN extensions anywhere * Changed addInlineStyle() to add styles to $this->mInlineStyles instead of $this->mScripts. This unbreaks addInlineStyle(), which was used for CSS previews * Added styles added through addStyle()/addInlineStyle() in the right place (right after normal RL styles) --- includes/OutputPage.php | 65 ++++++++++++++++++++------------------- includes/SkinTemplate.php | 2 +- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index a523f3cef9..4127210ce0 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -23,7 +23,7 @@ class OutputPage { var $mLastModified = '', $mETag = false; var $mCategoryLinks = array(), $mCategories = array(), $mLanguageLinks = array(); - var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array(); + var $mScripts = '', $mInlineStyles = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array(); var $mModules = array(), $mModuleScripts = array(), $mModuleStyles = array(), $mModuleMessages = array(); var $mResourceLoader; var $mInlineMsg = array(); @@ -2268,12 +2268,9 @@ class OutputPage { $ret .= implode( "\n", array( $this->getHeadLinks( $sk ), - $this->buildCssLinks(), - $this->getHeadItems(), + $this->buildCssLinks( $sk ), + $this->getHeadItems() ) ); - if ( $sk->usercss ) { - $ret .= Html::inlineStyle( $sk->usercss ); - } if ( $wgUseTrackbacks && $this->isArticleRelated() ) { $ret .= $this->getTitle()->trackbackRDF(); @@ -2623,29 +2620,6 @@ class OutputPage { } } } - - // Split the styles into three groups - $styles = array( 'other' => array(), 'user' => array(), 'site' => array() ); - $resourceLoader = $this->getResourceLoader(); - foreach ( $this->getModuleStyles() as $name ) { - $group = $resourceLoader->getModule( $name )->getGroup(); - // Modules in groups named "other" or anything different than "user" or "site" will - // be placed in the "other" group - $styles[isset( $styles[$group] ) ? $group : 'other'][] = $name; - } - - // We want site and user styles to override dynamically added styles from modules, but we want - // dynamically added styles to override statically added styles from other modules. So the order - // has to be other, dynamic, site, user - // Add statically added styles for other modules - $tags[] = $this->makeResourceLoaderLink( $sk, $styles['other'], 'styles' ); - // Add marker tag to mark the place where the client-side loader should inject dynamic styles - // We use a tag with a made-up name for this because that's valid HTML - $tags[] = Html::element( 'meta', array( 'name' => 'ResourceLoaderDynamicStyles', 'content' => '' ) ); - // Add site and user styles - $tags[] = $this->makeResourceLoaderLink( - $sk, array_merge( $styles['site'], $styles['user'] ), 'styles' - ); return implode( "\n", $tags ); } @@ -2696,15 +2670,42 @@ class OutputPage { * @param $style_css Mixed: inline CSS */ public function addInlineStyle( $style_css ){ - $this->mScripts .= Html::inlineStyle( $style_css ); + $this->mInlineStyles .= Html::inlineStyle( $style_css ); } /** * Build a set of s for the stylesheets specified in the $this->styles array. * These will be applied to various media & IE conditionals. + * @param $sk Skin object */ - public function buildCssLinks() { - return implode( "\n", $this->buildCssLinksArray() ); + public function buildCssLinks( $sk ) { + $ret = ''; + // Add ResourceLoader styles + // Split the styles into three groups + $styles = array( 'other' => array(), 'user' => array(), 'site' => array() ); + $resourceLoader = $this->getResourceLoader(); + foreach ( $this->getModuleStyles() as $name ) { + $group = $resourceLoader->getModule( $name )->getGroup(); + // Modules in groups named "other" or anything different than "user" or "site" will + // be placed in the "other" group + $styles[isset( $styles[$group] ) ? $group : 'other'][] = $name; + } + + // We want site and user styles to override dynamically added styles from modules, but we want + // dynamically added styles to override statically added styles from other modules. So the order + // has to be other, dynamic, site, user + // Add statically added styles for other modules + $ret .= $this->makeResourceLoaderLink( $sk, $styles['other'], 'styles' ); + // Add normal styles added through addStyle()/addInlineStyle() here + $ret .= implode( "\n", $this->buildCssLinksArray() ) . $this->mInlineStyles; + // Add marker tag to mark the place where the client-side loader should inject dynamic styles + // We use a tag with a made-up name for this because that's valid HTML + $ret .= Html::element( 'meta', array( 'name' => 'ResourceLoaderDynamicStyles', 'content' => '' ) ); + // Add site and user styles + $ret .= $this->makeResourceLoaderLink( + $sk, array_merge( $styles['site'], $styles['user'] ), 'styles' + ); + return $ret; } public function buildCssLinksArray() { diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index dcbd44b8eb..71046f57f0 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -219,7 +219,7 @@ class SkinTemplate extends Skin { $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces ); $tpl->set( 'html5version', $wgHtml5Version ); $tpl->set( 'headlinks', $out->getHeadLinks( $this ) ); - $tpl->set( 'csslinks', $out->buildCssLinks() ); + $tpl->set( 'csslinks', $out->buildCssLinks( $this ) ); if( $wgUseTrackbacks && $out->isArticleRelated() ) { $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() ); -- 2.20.1