diff options
Diffstat (limited to 'includes/installer/CliInstaller.php')
| -rw-r--r-- | includes/installer/CliInstaller.php | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index f9afbb20..38b4a824 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -2,6 +2,21 @@ /** * Core installer command line interface. * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @file * @ingroup Deployment */ @@ -117,7 +132,7 @@ class CliInstaller extends Installer { * @param $path String Full path to write LocalSettings.php to */ public function writeConfigurationFile( $path ) { - $ls = new LocalSettingsGenerator( $this ); + $ls = InstallerOverrides::getLocalSettingsGenerator( $this ); $ls->writeFile( "$path/LocalSettings.php" ); } @@ -148,7 +163,7 @@ class CliInstaller extends Installer { protected function getMessageText( $params ) { $msg = array_shift( $params ); - $text = wfMsgExt( $msg, array( 'parseinline' ), $params ); + $text = wfMessage( $msg, $params )->parse(); $text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text ); return html_entity_decode( strip_tags( $text ), ENT_QUOTES ); @@ -172,7 +187,7 @@ class CliInstaller extends Installer { if ( !$status->isOk() ) { echo "\n"; - exit; + exit( 1 ); } } |