dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dcce018)
Follow-up r91518
authorPlatonides <platonides@users.mediawiki.org>
Tue, 19 Jul 2011 20:36:09 +0000 (20:36 +0000)
committerPlatonides <platonides@users.mediawiki.org>
Tue, 19 Jul 2011 20:36:09 +0000 (20:36 +0000)
includes/OutputPage.php patch | blob | history

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0b4f813..c9b5c4b 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2261,14 +2261,16 @@ $templates
         * @return String: The doctype, opening <html>, and head element.
         */
        public function headElement( Skin $sk, $includeStyle = true ) {
-               global $wgUseTrackbacks, $wgLang;
+               global $wgLang, $wgContLang, $wgUseTrackbacks;
+               $userdir = $wgLang->getDir();
+               $sitedir = $wgContLang->getDir();
 
                if ( $sk->commonPrintStylesheet() ) {
                        $this->addModuleStyles( 'mediawiki.legacy.wikiprintable' );
                }
                $sk->setupUserCss( $this );
 
-               $ret = Html::htmlHeader( array( 'lang' => $wgLang->getCode(), 'dir' => $wgLang->getDir() ) );
+               $ret = Html::htmlHeader( array( 'lang' => $wgLang->getCode(), 'dir' => $userdir ) );
 
                if ( $this->getHTMLTitle() == '' ) {
                        $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() ) );
@@ -2315,9 +2317,6 @@ $templates
                }
 
                # Classes for LTR/RTL directionality support
-               global $wgLang, $wgContLang;
-               $userdir = $wgLang->getDir();
-               $sitedir = $wgContLang->getDir();
                $bodyAttrs['class'] = "mediawiki $userdir sitedir-$sitedir";
 
                if ( $this->getContext()->getLang()->capitalizeAllNouns() ) {
Wiklou, le Wiki du Wiklou