From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sun, 27 Apr 2008 14:49:40 +0000 (+0000)
Subject: * Fix the previous commit
X-Git-Tag: 1.31.0-rc.0~48046
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=a2a69d487d2d160316f315806bcbe7db69ace73a;p=lhc%2Fweb%2Fwiklou.git

* Fix the previous commit
---

diff --git a/languages/Language.php b/languages/Language.php
index ab5a81a85d..dbe7b49c62 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2148,7 +2148,7 @@ class Language {
 		self::$mLocalisationCache[$code] = $cache;
 		if ( !$disableCache ) {
 			$wgMemc->set( $memcKey, $cache );
-			$wgMemc->set( $fbMemcKey, $cache['fallback'] );
+			$wgMemc->set( $fbMemcKey, (string) $cache['fallback'] );
 		}
 
 		wfProfileOut( __METHOD__ );
@@ -2183,17 +2183,18 @@ class Language {
 	 */
 	static function getFallbackFor( $code ) {
 		global $wgMemc;
-		$memcKey = wfMemcKey('fallback', $code );
+		$memcKey = wfMemcKey( 'fallback', $code );
 		$fbcode = $wgMemc->get( $memcKey );
 
-		if ( $fbcode !== null ) {
-			wfDebug( __METHOD__ . ": got fallback for $code from memc: $fbcode\n" );
+		if ( $fbcode !== false ) {
+			wfDebug( __METHOD__ . ": got fallback for $code from memc: '$fbcode'\n" );
+			if ( $fbcode === '' ) $fbcode = false;
 			return $fbcode;
 		}
 		
 		self::loadLocalisation( $code );
 		$fbcode = self::$mLocalisationCache[$code]['fallback'];
-		$wgMemc->set( $memcKey, $fbcode );
+		$wgMemc->set( $memcKey, (string) $fbcode );
 		return $fbcode;
 	}