From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 10 Sep 2008 12:12:59 +0000 (+0000)
Subject: (bug 15543) fix for r38139: don't include $wgUser->mTouched and smaxage=0 in query... 
X-Git-Tag: 1.31.0-rc.0~45383
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=f9da6c460b6f4cfd457b0ebf1a6e7a347755706b;p=lhc%2Fweb%2Fwiklou.git

(bug 15543) fix for r38139: don't include $wgUser->mTouched and smaxage=0 in query strings of site CSS, but only to generated css (action=raw&gen=css).
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 0c45f49d59..f6ba839b3d 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -551,12 +551,6 @@ END;
 			'action' => 'raw',
 			'maxage' => $wgSquidMaxage,
 		);
-		if( $wgUser->isLoggedIn() ) {
-			// Ensure that logged-in users' generated CSS isn't clobbered
-			// by anons' publicly cacheable generated CSS.
-			$siteargs['smaxage'] = '0';
-			$siteargs['ts'] = $wgUser->mTouched;
-		}
 
 		// Add any extension CSS
 		foreach( $out->getExtStyle() as $tag ) {
@@ -573,14 +567,20 @@ END;
 				'smaxage' => $wgSquidMaxage
 			) + $siteargs );
 			# Site settings must override extension css! (bug 15025)
-			$out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) );
-			$out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI), "print" );
+			$out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) );
+			$out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' );
 			if( $wgHandheldStyle ) {
-				$out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI), "handheld" );
+				$out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI ), 'handheld' );
 			}
 			$out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
 		}
 
+		if( $wgUser->isLoggedIn() ) {
+			// Ensure that logged-in users' generated CSS isn't clobbered
+			// by anons' publicly cacheable generated CSS.
+			$siteargs['smaxage'] = '0';
+			$siteargs['ts'] = $wgUser->mTouched;
+		}
 		// Per-user styles based on preferences
 		$siteargs['gen'] = 'css';
 		if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
@@ -597,8 +597,8 @@ END;
 				// @FIXME: properly escape the cdata!
 				$this->usercss = "/*<![CDATA[*/\n" . $previewCss . "/*]]>*/";
 			} else {
-				$out->addStyle( self::makeUrl($this->userpage .'/'.$this->getSkinName() .'.css',
-					'action=raw&ctype=text/css') );
+				$out->addStyle( self::makeUrl($this->userpage . '/' . $this->getSkinName() .'.css',
+					'action=raw&ctype=text/css' ) );
 			}
 		}