(part of bug 6100) Set the directionality based on user language instead of content...

diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index 33859f0..d391f63 100644 (file)
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -140,8 +140,11 @@ class ResourceLoaderContext {
                if ( $this->direction === null ) {
                        $this->direction = $this->request->getVal( 'dir' );
                        if ( !$this->direction ) {
-                               global $wgContLang;
-                               $this->direction = $wgContLang->getDir();
+                               global $wgBetterDirectionality, $wgContLang;
+                               // if $wgBetterDirectionality is true, set
+                               // directionality based on user language (see bug 6100)
+                               $this->direction = ( $wgBetterDirectionality ?
+                                       Language::factory( $this->language )->getDir() : $wgContLang->getDir() );
                        }
                }
                return $this->direction;