Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

followup r101490, remove extra tabs after talking to Nikerabbit.

Browse source
This commit is contained in:
Mark A. Hershberger 2011-11-03 13:57:25 +00:00
parent 77c7158ecb
commit e0963b7ecc
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/LocalisationCache.php
View 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 );
}
}