Index: trunk/phase3/includes/resourceloader/ResourceLoaderContext.php |
— | — | @@ -140,8 +140,11 @@ |
141 | 141 | if ( $this->direction === null ) { |
142 | 142 | $this->direction = $this->request->getVal( 'dir' ); |
143 | 143 | if ( !$this->direction ) { |
144 | | - global $wgContLang; |
145 | | - $this->direction = $wgContLang->getDir(); |
| 144 | + global $wgBetterDirectionality, $wgContLang; |
| 145 | + // if $wgBetterDirectionality is true, set |
| 146 | + // directionality based on user language (see bug 6100) |
| 147 | + $this->direction = ( $wgBetterDirectionality ? |
| 148 | + Language::factory( $this->language )->getDir() : $wgContLang->getDir() ); |
146 | 149 | } |
147 | 150 | } |
148 | 151 | return $this->direction; |