From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 3 Jun 2004 01:29:54 +0000 (+0000)
Subject: use site-wide \<Skinname\>.css pulled from MediaWiki namespace
X-Git-Tag: 1.5.0alpha1~3055
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=a5f34c3f16d4267721135b5420ab2a46e8ac52d3;p=lhc%2Fweb%2Fwiklou.git

use site-wide \<Skinname\>.css pulled from MediaWiki namespace
---

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index b28a74412c..6030bb7465 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -559,13 +559,17 @@
 			}
 		}
 		/* private */ function setupUserCssJs () {
-			global $wgRequest, $wgTitle;
+			global $wgRequest, $wgTitle, $wgSquidMaxage;
 			$action = $wgRequest->getText('action');
+			# global site css from MediaWiki NS
+			$this->usercss = '@import url('.
+			$this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI).');'."\n";
+			
 			if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
 				// css preview
-				$this->usercss = $wgRequest->getText('wpTextbox1');
+				$this->usercss .= $wgRequest->getText('wpTextbox1');
 			} else {
-				$this->usercss = '@import url('.
+				$this->usercss .= '@import url('.
 				$this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css').');';
 			}
 			if($wgTitle->isJsSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {