| Index: trunk/phase3/includes/LocalisationCache.php |
| — | — | @@ -198,12 +198,12 @@ |
| 199 | 199 | public function isMergeableKey( $key ) { |
| 200 | 200 | if ( !isset( $this->mergeableKeys ) ) { |
| 201 | 201 | $this->mergeableKeys = array_flip( array_merge( |
| 202 | | - self::$mergeableMapKeys, |
| 203 | | - self::$mergeableListKeys, |
| 204 | | - self::$mergeableAliasListKeys, |
| 205 | | - self::$optionalMergeKeys, |
| 206 | | - self::$magicWordKeys |
| 207 | | - ) ); |
| | 202 | + self::$mergeableMapKeys, |
| | 203 | + self::$mergeableListKeys, |
| | 204 | + self::$mergeableAliasListKeys, |
| | 205 | + self::$optionalMergeKeys, |
| | 206 | + self::$magicWordKeys |
| | 207 | + ) ); |
| 208 | 208 | } |
| 209 | 209 | return isset( $this->mergeableKeys[$key] ); |
| 210 | 210 | } |
| — | — | @@ -515,7 +515,7 @@ |
| 516 | 516 | $oldSynonyms = array_slice( $fallbackInfo, 1 ); |
| 517 | 517 | $newSynonyms = array_slice( $value[$magicName], 1 ); |
| 518 | 518 | $synonyms = array_values( array_unique( array_merge( |
| 519 | | - $newSynonyms, $oldSynonyms ) ) ); |
| | 519 | + $newSynonyms, $oldSynonyms ) ) ); |
| 520 | 520 | $value[$magicName] = array_merge( array( $fallbackInfo[0] ), $synonyms ); |
| 521 | 521 | } |
| 522 | 522 | } |