| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | Skipping creation.", |
| 459 | 459 | 'config-install-tables-failed' => "'''Error''': Table creation failed with the following error: $1", |
| 460 | 460 | 'config-install-interwiki' => 'Populating default interwiki table', |
| 461 | | - 'config-install-interwiki-sql' => 'Could not find file <code>interwiki.sql</code>.', |
| | 461 | + 'config-install-interwiki-list' => 'Could not read file <code>interwiki.list</code>.', |
| 462 | 462 | 'config-install-interwiki-exists' => "'''Warning''': The interwiki table seems to already have entries. |
| 463 | 463 | Skipping default list.", |
| 464 | 464 | 'config-install-stats' => 'Initializing statistics', |
| Index: trunk/phase3/includes/installer/DatabaseInstaller.php |
| — | — | @@ -547,11 +547,13 @@ |
| 548 | 548 | return $status; |
| 549 | 549 | } |
| 550 | 550 | global $IP; |
| | 551 | + wfSuppressWarnings(); |
| 551 | 552 | $rows = file( "$IP/maintenance/interwiki.list", |
| 552 | 553 | FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES ); |
| | 554 | + wfRestoreWarnings(); |
| 553 | 555 | $interwikis = array(); |
| 554 | 556 | if ( !$rows ) { |
| 555 | | - return Status::newFatal( 'config-install-interwiki-sql' ); |
| | 557 | + return Status::newFatal( 'config-install-interwiki-list' ); |
| 556 | 558 | } |
| 557 | 559 | foreach( $rows as $row ) { |
| 558 | 560 | $row = preg_replace( '/^\s*([^#]*?)\s*(#.*)?$/', '\\1', $row ); // strip comments - whee |