| Index: trunk/phase3/includes/LocalisationCache.php |
| — | — | @@ -190,12 +190,12 @@ |
| 191 | 191 | public function isMergeableKey( $key ) { |
| 192 | 192 | if ( !isset( $this->mergeableKeys ) ) { |
| 193 | 193 | $this->mergeableKeys = array_flip( array_merge( |
| 194 | | - self::$mergeableMapKeys, |
| 195 | | - self::$mergeableListKeys, |
| 196 | | - self::$mergeableAliasListKeys, |
| 197 | | - self::$optionalMergeKeys, |
| 198 | | - self::$magicWordKeys |
| 199 | | - ) ); |
| | 194 | + self::$mergeableMapKeys, |
| | 195 | + self::$mergeableListKeys, |
| | 196 | + self::$mergeableAliasListKeys, |
| | 197 | + self::$optionalMergeKeys, |
| | 198 | + self::$magicWordKeys |
| | 199 | + ) ); |
| 200 | 200 | } |
| 201 | 201 | return isset( $this->mergeableKeys[$key] ); |
| 202 | 202 | } |
| — | — | @@ -231,9 +231,8 @@ |
| 232 | 232 | * @return null |
| 233 | 233 | */ |
| 234 | 234 | public function getSubitem( $code, $key, $subkey ) { |
| 235 | | - if ( !isset( $this->loadedSubitems[$code][$key][$subkey] ) |
| 236 | | - && !isset( $this->loadedItems[$code][$key] ) ) |
| 237 | | - { |
| | 235 | + if ( !isset( $this->loadedSubitems[$code][$key][$subkey] ) && |
| | 236 | + !isset( $this->loadedItems[$code][$key] ) ) { |
| 238 | 237 | wfProfileIn( __METHOD__.'-load' ); |
| 239 | 238 | $this->loadSubitem( $code, $key, $subkey ); |
| 240 | 239 | wfProfileOut( __METHOD__.'-load' ); |
| — | — | @@ -324,9 +323,8 @@ |
| 325 | 324 | } |
| 326 | 325 | |
| 327 | 326 | // Check to see if initLanguage() loaded it for us |
| 328 | | - if ( isset( $this->loadedItems[$code][$key] ) |
| 329 | | - || isset( $this->loadedSubitems[$code][$key][$subkey] ) ) |
| 330 | | - { |
| | 327 | + if ( isset( $this->loadedItems[$code][$key] ) || |
| | 328 | + isset( $this->loadedSubitems[$code][$key][$subkey] ) ) { |
| 331 | 329 | return; |
| 332 | 330 | } |
| 333 | 331 | |
| — | — | @@ -507,7 +505,7 @@ |
| 508 | 506 | $oldSynonyms = array_slice( $fallbackInfo, 1 ); |
| 509 | 507 | $newSynonyms = array_slice( $value[$magicName], 1 ); |
| 510 | 508 | $synonyms = array_values( array_unique( array_merge( |
| 511 | | - $newSynonyms, $oldSynonyms ) ) ); |
| | 509 | + $newSynonyms, $oldSynonyms ) ) ); |
| 512 | 510 | $value[$magicName] = array_merge( array( $fallbackInfo[0] ), $synonyms ); |
| 513 | 511 | } |
| 514 | 512 | } |