From: Mark A. Hershberger Date: Thu, 3 Nov 2011 13:57:25 +0000 (+0000) Subject: followup r101490, remove extra tabs after talking to Nikerabbit. X-Git-Tag: 1.31.0-rc.0~26741 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=e0963b7ecc9c3bd97c66e084424d76c75d13d2ed;p=lhc%2Fweb%2Fwiklou.git followup r101490, remove extra tabs after talking to Nikerabbit. --- diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php index e4e1bed9f4..7e650a94e8 100644 --- a/includes/LocalisationCache.php +++ b/includes/LocalisationCache.php @@ -198,12 +198,12 @@ class LocalisationCache { public function isMergeableKey( $key ) { if ( !isset( $this->mergeableKeys ) ) { $this->mergeableKeys = array_flip( array_merge( - self::$mergeableMapKeys, - self::$mergeableListKeys, - self::$mergeableAliasListKeys, - self::$optionalMergeKeys, - self::$magicWordKeys - ) ); + self::$mergeableMapKeys, + self::$mergeableListKeys, + self::$mergeableAliasListKeys, + self::$optionalMergeKeys, + self::$magicWordKeys + ) ); } return isset( $this->mergeableKeys[$key] ); } @@ -515,7 +515,7 @@ class LocalisationCache { $oldSynonyms = array_slice( $fallbackInfo, 1 ); $newSynonyms = array_slice( $value[$magicName], 1 ); $synonyms = array_values( array_unique( array_merge( - $newSynonyms, $oldSynonyms ) ) ); + $newSynonyms, $oldSynonyms ) ) ); $value[$magicName] = array_merge( array( $fallbackInfo[0] ), $synonyms ); } }