X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=b31b10ffc7c014ca2832383f5e37a80a523c6257;hb=d446513bf63a97e3aa618772bbc21de023682621;hp=81e78b5914c53039da31603ac5f5853cc059c60b;hpb=fb7b3eebeb8de47eb42e8d6ccf204106a2d6d9e4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 81e78b5914..b31b10ffc7 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -160,7 +160,7 @@ class LanguageConverter {
 
 		$req = $this->getURLVariant();
 
-		if ( $wgUser->isLoggedIn() && !$req ) {
+		if ( $wgUser->isSafeToLoad() && $wgUser->isLoggedIn() && !$req ) {
 			$req = $this->getUserVariant();
 		} elseif ( !$req ) {
 			$req = $this->getHeaderVariant();
@@ -257,6 +257,9 @@ class LanguageConverter {
 		// Get language variant preference from logged in users
 		// Don't call this on stub objects because that causes infinite
 		// recursion during initialisation
+		if ( !$wgUser->isSafeToLoad() ) {
+			return false;
+		}
 		if ( $wgUser->isLoggedIn() ) {
 			if ( $this->mMainLanguageCode == $wgContLang->getCode() ) {
 				$ret = $wgUser->getOption( 'variant' );