From 0e7692a856c112c8cdb5ee69cd1303fa44abe9e2 Mon Sep 17 00:00:00 2001 From: River Tarnell Date: Wed, 9 May 2007 12:54:54 +0000 Subject: [PATCH] useskin=monobook is very sad because generated CSS is for user's default skin and messes up layout. tack useskin=... onto the URL if the user specified it. --- includes/SkinTemplate.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 9d090774ee..f973d77069 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -968,9 +968,12 @@ class SkinTemplate extends Skin { # If we use the site's dynamic CSS, throw that in, too if ( $wgUseSiteCss ) { $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage"; + $skinquery = ''; + if (($us = $wgRequest->getVal('useskin', false)) !== false) + $skinquery = "&useskin=$us"; $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n"; $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n"; - $sitecss .= '@import "' . self::makeUrl( '-', 'action=raw&gen=css' . $siteargs ) . '";' . "\n"; + $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n"; } # If we use any dynamic CSS, make a little CDATA block out of it. -- 2.20.1