followup r101490, remove extra tabs after talking to Nikerabbit.
authorMark A. Hershberger <mah@users.mediawiki.org>
Thu, 3 Nov 2011 13:57:25 +0000 (13:57 +0000)
committerMark A. Hershberger <mah@users.mediawiki.org>
Thu, 3 Nov 2011 13:57:25 +0000 (13:57 +0000)
includes/LocalisationCache.php

index e4e1bed..7e650a9 100644 (file)
@@ -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 );
                        }
                }