From: Lisa Ridley <lhridley@users.mediawiki.org>
Date: Tue, 23 Mar 2010 17:12:26 +0000 (+0000)
Subject: Fixes bug 22916 -- stylesheets for Vector skin now load in the correct order
X-Git-Tag: 1.31.0-rc.0~37379
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=6df94d492c2d7289c8d0ea442035067181086376;p=lhc%2Fweb%2Fwiklou.git

Fixes bug 22916 -- stylesheets for Vector skin now load in the correct order
---

diff --git a/skins/Vector.php b/skins/Vector.php
index cd233a946d..fbb14f09a0 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -30,9 +30,6 @@ class SkinVector extends SkinTemplate {
 		
 		parent::initPage( $out );
 
-		// Append skin-specific styles
-		$out->addStyle( 'vector/main-rtl.css', 'screen', '', 'rtl' );
-		$out->addStyle( 'vector/main-ltr.css', 'screen', '', 'ltr' );
 		// Append CSS which includes IE only behavior fixes for hover support -
 		// this is better than including this in a CSS fille since it doesn't
 		// wait for the CSS file to load before fetching the HTC file.
@@ -41,14 +38,32 @@ class SkinVector extends SkinTemplate {
 				$wgStylePath .
 				'/vector/csshover.htc")}</style><![endif]-->'
 		);
+	}
+
+	/**
+	 * Load skin and user css files in the correct order
+	 * fixes bug 22916
+	 * @param object $out OutputPage object
+	 */
+
+	function setupSkinUserCss( OutputPage $out ){
+		global $wgStylePath, $wgVectorExtraStyles;
+		
+		parent::setupSkinUserCss( $out );
+
+		// Append skin-specific styles
+		$out->addStyle( 'origins/main-rtl.css', 'screen', '', 'rtl' );
+		$out->addStyle( 'origins/main-ltr.css', 'screen', '', 'ltr' );
+
 		// Add extra stylesheets
 		// THIS IS ONLY USEFUL FOR EXPERIMENTING WITH DIFFERNT STYLE OPTIONS! THIS WILL BE REMOVED IN THE NEAR FUTURE.
 		if ( is_array( $wgVectorExtraStyles ) ) {
 			foreach ( $wgVectorExtraStyles as $style ) {
-				$out->addStyle( 'vector/' . $style, 'screen' );
+				$out->addStyle( 'origins/' . $style, 'screen' );
 			}
 		}
 	}
+
 	/**
 	 * Builds a structured array of links used for tabs and menus
 	 * @return array