From 31b0483aa68d4cc04410f1491c19b51c251b894c Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 4 Feb 2011 21:10:02 +0000 Subject: [PATCH] Suppress warnings on reading interwiki.list in case permissions or something else makes it not work. Tweak message since we no longer read the .sql file. --- includes/installer/DatabaseInstaller.php | 4 +++- includes/installer/Installer.i18n.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php index 957ee511b3..ae265c6119 100644 --- a/includes/installer/DatabaseInstaller.php +++ b/includes/installer/DatabaseInstaller.php @@ -547,11 +547,13 @@ abstract class DatabaseInstaller { return $status; } global $IP; + wfSuppressWarnings(); $rows = file( "$IP/maintenance/interwiki.list", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES ); + wfRestoreWarnings(); $interwikis = array(); if ( !$rows ) { - return Status::newFatal( 'config-install-interwiki-sql' ); + return Status::newFatal( 'config-install-interwiki-list' ); } foreach( $rows as $row ) { $row = preg_replace( '/^\s*([^#]*?)\s*(#.*)?$/', '\\1', $row ); // strip comments - whee diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index dc638bc7b7..5aaed093a4 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -457,7 +457,7 @@ Make sure that the user "$1" can write to the schema "$2".', Skipping creation.", 'config-install-tables-failed' => "'''Error''': Table creation failed with the following error: $1", 'config-install-interwiki' => 'Populating default interwiki table', - 'config-install-interwiki-sql' => 'Could not find file interwiki.sql.', + 'config-install-interwiki-list' => 'Could not read file interwiki.list.', 'config-install-interwiki-exists' => "'''Warning''': The interwiki table seems to already have entries. Skipping default list.", 'config-install-stats' => 'Initializing statistics', -- 2.20.1