| Index: trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php |
| — | — | @@ -88,7 +88,7 @@ |
| 89 | 89 | closedir( $dir ); |
| 90 | 90 | |
| 91 | 91 | // Find the changed English strings (as these messages won't be updated in ANY language) |
| 92 | | - $changedEnglishStrings = self::compareFiles( $localdir . "/MessagesEn.php", $svndir . "/MessagesEn.php", $verbose ); |
| | 92 | + $changedEnglishStrings = self::compareFiles( $localdir . "/MessagesEn.php", $svndir . "/MessagesEn.php", $verbose, true ); |
| 93 | 93 | |
| 94 | 94 | // Count the changes |
| 95 | 95 | $changedCount = 0; |
| — | — | @@ -184,8 +184,8 @@ |
| 185 | 185 | $basefilecontents = preg_replace( "/\\\$messages/", "\$base_messages", $basefilecontents ); |
| 186 | 186 | |
| 187 | 187 | $basehash = md5( $basefilecontents ); |
| 188 | | - // If this is the remote file check if the file has changed since our last update |
| 189 | | - if ( preg_match( "/^http/", $basefile ) && !$alwaysGetResult ) { |
| | 188 | + // Check if the file has changed since our last update |
| | 189 | + if ( !$alwaysGetResult ) { |
| 190 | 190 | if ( !self::checkHash( $basefile, $basehash ) ) { |
| 191 | 191 | self::myLog( "Skipping {$langcode} since the remote file hasn't changed since our last update" ); |
| 192 | 192 | return array(); |
| — | — | @@ -243,13 +243,9 @@ |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | |
| 247 | | - if ( preg_match( "/^http/", $basefile )) { |
| 248 | | - self::saveHash( $basefile, $basehash ); |
| 249 | | - } |
| | 247 | + self::saveHash( $basefile, $basehash ); |
| 250 | 248 | |
| 251 | | - if ( preg_match( "/^http/", $comparefile )) { |
| 252 | | - self::saveHash( $comparefile, $comparehash ); |
| 253 | | - } |
| | 249 | + self::saveHash( $comparefile, $comparehash ); |
| 254 | 250 | |
| 255 | 251 | return $changedStrings; |
| 256 | 252 | } |
| — | — | @@ -455,13 +451,9 @@ |
| 456 | 452 | // And log some stuff |
| 457 | 453 | self::myLog( "Updated " . $updates . " messages for the '{$extension}' extension" ); |
| 458 | 454 | |
| 459 | | - if ( preg_match( "/^http/", $basefile )) { |
| 460 | | - self::saveHash( $basefile, $basehash ); |
| 461 | | - } |
| | 455 | + self::saveHash( $basefile, $basehash ); |
| 462 | 456 | |
| 463 | | - if ( preg_match( "/^http/", $comparefile )) { |
| 464 | | - self::saveHash( $comparefile, $comparehash ); |
| 465 | | - } |
| | 457 | + self::saveHash( $comparefile, $comparehash ); |
| 466 | 458 | |
| 467 | 459 | return $updates; |
| 468 | 460 | } |