From: Alexander Sigachov <ajvol@users.mediawiki.org>
Date: Tue, 15 Nov 2005 20:37:39 +0000 (+0000)
Subject: userstyle should be last in css import list
X-Git-Tag: 1.6.0~1175
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=22856ff513ff2e01e90075f2e29321df6dd023bf;p=lhc%2Fweb%2Fwiklou.git

userstyle should be last in css import list
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 0fb968eccd..58b92cd6c1 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -212,21 +212,16 @@ class Skin extends Linker {
 
 	# get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
 	function getUserStylesheet() {
-		global $wgOut, $wgStylePath, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
+		global $wgOut, $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
 		$sheet = $this->getStylesheet();
 		$action = $wgRequest->getText('action');
 		$s = "@import \"$wgStylePath/$sheet\";\n";
 		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n";
-		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
-			if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
-				$s .= $wgRequest->getText('wpTextbox1');
-			} else {
-				$userpage = $wgUser->getUserPage();
-				$s.= '@import "'.$this->makeUrl(
-					$userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
-					'action=raw&ctype=text/css').'";'."\n";
-			}
-		}
+
+		$query = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
+		$s .= '@import "' . $this->makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
+			'@import "'.$this->makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
+
 		$s .= $this->doGetUserStyles();
 		return $s."\n";
 	}
@@ -253,11 +248,20 @@ class Skin extends Linker {
 	 * Some styles that are set by user through the user settings interface.
 	 */
 	function doGetUserStyles() {
-		global $wgUser, $wgContLang, $wgSquidMaxage;
+		global $wgUser, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
 
-		$query = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
-		$s = '@import "' . $this->makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
-			'@import "'.$this->makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
+		$s = '';
+		
+		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
+			if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+				$s .= $wgRequest->getText('wpTextbox1');
+			} else {
+				$userpage = $wgUser->getUserPage();
+				$s.= '@import "'.$this->makeUrl(
+					$userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
+					'action=raw&ctype=text/css').'";'."\n";
+			}
+		}
 
 		return $s . $this->reallyDoGetUserStyles();
 	}