Merged localisation-work branch:

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index c194ace..daf1534 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -72,11 +72,12 @@ class LanguageConverter {
 
 
        /**
-     * get preferred language variants.
+        * get preferred language variants.
+        * @param boolean $fromUser Get it from $wgUser's preferences
      * @return string the preferred language code
      * @access public
        */
-       function getPreferredVariant() {
+       function getPreferredVariant( $fromUser = true ) {
                global $wgUser, $wgRequest;
 
                if($this->mPreferredVariant)
@@ -90,7 +91,9 @@ class LanguageConverter {
                }
 
                // get language variant preference from logged in users
-               if(is_object($wgUser) && $wgUser->isLoggedIn() )  {
+               // Don't call this on stub objects because that causes infinite 
+               // recursion during initialisation
+               if( $fromUser && $wgUser->isLoggedIn() )  {
                        $this->mPreferredVariant = $wgUser->getOption('variant');
                        return $this->mPreferredVariant;
                }