Hard deprecate Parser::disableCache()

[lhc/web/wiklou.git] / maintenance / install.php

diff --git a/maintenance/install.php b/maintenance/install.php
index a71bb74..bf39fbd 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -60,6 +60,12 @@ class CommandLineInstaller extends Maintenance {
                        false,
                        true
                );
+               $this->addOption(
+                       'server',
+                       'The base URL of the web server the wiki will be on (http://localhost)',
+                       false,
+                       true
+               );
 
                $this->addOption( 'lang', 'The language to use (en)', false, true );
                /* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */
@@ -118,7 +124,7 @@ class CommandLineInstaller extends Maintenance {
                try {
                        $installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
                } catch ( \MediaWiki\Installer\InstallException $e ) {
-                       $this->output( $e->getStatus()->getMessage()->parse() . "\n" );
+                       $this->output( $e->getStatus()->getMessage( false, false, 'en' )->text() . "\n" );
                        return false;
                }
 
@@ -133,6 +139,8 @@ class CommandLineInstaller extends Maintenance {
                if ( !$envChecksOnly ) {
                        $status = $installer->execute();
                        if ( !$status->isGood() ) {
+                               $installer->showStatusMessage( $status );
+
                                return false;
                        }
                        $installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );