From a2a69d487d2d160316f315806bcbe7db69ace73a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sun, 27 Apr 2008 14:49:40 +0000
Subject: [PATCH] * Fix the previous commit

---
 languages/Language.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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;
 	}
 
-- 
2.20.1