| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2148,7 +2148,7 @@ |
| 2149 | 2149 | self::$mLocalisationCache[$code] = $cache; |
| 2150 | 2150 | if ( !$disableCache ) { |
| 2151 | 2151 | $wgMemc->set( $memcKey, $cache ); |
| 2152 | | - $wgMemc->set( $fbMemcKey, $cache['fallback'] ); |
| | 2152 | + $wgMemc->set( $fbMemcKey, (string) $cache['fallback'] ); |
| 2153 | 2153 | } |
| 2154 | 2154 | |
| 2155 | 2155 | wfProfileOut( __METHOD__ ); |
| — | — | @@ -2183,17 +2183,18 @@ |
| 2184 | 2184 | */ |
| 2185 | 2185 | static function getFallbackFor( $code ) { |
| 2186 | 2186 | global $wgMemc; |
| 2187 | | - $memcKey = wfMemcKey('fallback', $code ); |
| | 2187 | + $memcKey = wfMemcKey( 'fallback', $code ); |
| 2188 | 2188 | $fbcode = $wgMemc->get( $memcKey ); |
| 2189 | 2189 | |
| 2190 | | - if ( $fbcode !== null ) { |
| 2191 | | - wfDebug( __METHOD__ . ": got fallback for $code from memc: $fbcode\n" ); |
| | 2190 | + if ( $fbcode !== false ) { |
| | 2191 | + wfDebug( __METHOD__ . ": got fallback for $code from memc: '$fbcode'\n" ); |
| | 2192 | + if ( $fbcode === '' ) $fbcode = false; |
| 2192 | 2193 | return $fbcode; |
| 2193 | 2194 | } |
| 2194 | 2195 | |
| 2195 | 2196 | self::loadLocalisation( $code ); |
| 2196 | 2197 | $fbcode = self::$mLocalisationCache[$code]['fallback']; |
| 2197 | | - $wgMemc->set( $memcKey, $fbcode ); |
| | 2198 | + $wgMemc->set( $memcKey, (string) $fbcode ); |
| 2198 | 2199 | return $fbcode; |
| 2199 | 2200 | } |
| 2200 | 2201 | |