| Index: trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | // the nonexistent cache file for en a couple hundred times |
| 32 | 32 | continue; |
| 33 | 33 | } |
| 34 | | - |
| | 34 | + |
| 35 | 35 | $cache['messages'] = array_merge( |
| 36 | 36 | $cache['messages'], |
| 37 | 37 | self::readFile( $code ) |
| — | — | @@ -455,7 +455,7 @@ |
| 456 | 456 | //foreach ( $changedStrings as $key => $value ) { |
| 457 | 457 | // HACK for r103763 CR: store all messages, even unchanged ones |
| 458 | 458 | // TODO this file is a mess and needs to be rewritten |
| 459 | | - foreach ( array_merge( array_keys( $base_messages, $compare_messages ) as $key ) { |
| | 459 | + foreach ( array_merge( array_keys( $base_messages ), $compare_messages ) as $key ) { |
| 460 | 460 | // Only update the translation if this message wasn't changed in English |
| 461 | 461 | if ( !isset( $forbiddenKeys[$key] ) && isset( $base_messages[$key] ) ) { |
| 462 | 462 | $new_messages[$key] = $base_messages[$key]; |