From 81b40a37e517f202ad1458f5c5c279db6b3329f4 Mon Sep 17 00:00:00 2001
From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Sat, 4 Sep 2010 10:28:41 +0000
Subject: [PATCH] Only flip CSS if dir is different from $wgContLang

---
 includes/ResourceLoader.php        |  2 +-
 includes/ResourceLoaderContext.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 5fad05a6d2..4b208ce30c 100644
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -294,7 +294,7 @@ class ResourceLoader {
 				$context->shouldIncludeStyles() &&
 				( $styles .= self::$modules[$name]->getStyle( $context ) ) !== ''
 			) {
-				if ( $context->getDirection() == 'rtl' ) {
+				if ( $context->getFlip() ) {
 					$styles = self::filter( 'flip-css', $styles );
 				}
 				$styles = $context->getDebug() ? $styles : self::filter( 'minify-css', $styles );
diff --git a/includes/ResourceLoaderContext.php b/includes/ResourceLoaderContext.php
index 36d9cea654..5518023a47 100644
--- a/includes/ResourceLoaderContext.php
+++ b/includes/ResourceLoaderContext.php
@@ -31,6 +31,7 @@ class ResourceLoaderContext {
 	protected $modules;
 	protected $language;
 	protected $direction;
+	protected $flip;
 	protected $skin;
 	protected $debug;
 	protected $only;
@@ -39,7 +40,7 @@ class ResourceLoaderContext {
 	/* Methods */
 	
 	public function __construct( WebRequest $request, $server ) {
-		global $wgUser, $wgLang, $wgDefaultSkin;
+		global $wgUser, $wgLang, $wgContLang, $wgDefaultSkin;
 		
 		$this->request = $request;
 		$this->server = $server;
@@ -60,6 +61,8 @@ class ResourceLoaderContext {
 		if ( !$this->skin ) {
 			$this->skin = $wgDefaultSkin;
 		}
+		// Evaluate flip
+		$this->flip = $wgContLang->getDir() !== $this->direction;
 	}
 	
 	public function getRequest() {
@@ -77,11 +80,15 @@ class ResourceLoaderContext {
 	public function getLanguage() {
 		return $this->language;
 	}
-	
+
 	public function getDirection() {
 		return $this->direction;
 	}
 	
+	public function getFlip() {
+		return $this->flip;
+	}
+	
 	public function getSkin() {
 		return $this->skin;
 	}
-- 
2.20.1