Installer: Minor tweaks to UI

[lhc/web/wiklou.git] / includes / installer / CliInstaller.php

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 9f7ed7b..1c7762b 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -49,9 +49,9 @@ class CliInstaller extends Installer {
        /**
         * Constructor.
         *
-        * @param $siteName
-        * @param $admin
-        * @param $option Array
+        * @param string $siteName
+        * @param string $admin
+        * @param array $option
         */
        function __construct( $siteName, $admin = null, array $option = array() ) {
                global $wgContLang;
@@ -138,7 +138,8 @@ class CliInstaller extends Installer {
 
        public function startStage( $step ) {
                // Messages: config-install-database, config-install-tables, config-install-interwiki,
-               // config-install-stats, config-install-keys, config-install-sysop, config-install-mainpage
+               // config-install-stats, config-install-keys, config-install-sysop, config-install-mainpage,
+               // config-install-extensions
                $this->showMessage( "config-install-$step" );
        }
 
@@ -158,7 +159,7 @@ class CliInstaller extends Installer {
        }
 
        /**
-        * @param $params array
+        * @param array $params
         *
         * @return string
         */
@@ -168,6 +169,7 @@ class CliInstaller extends Installer {
                $text = wfMessage( $msg, $params )->parse();
 
                $text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 &lt;$1&gt;', $text );
+
                return html_entity_decode( strip_tags( $text ), ENT_QUOTES );
        }
 
@@ -197,15 +199,17 @@ class CliInstaller extends Installer {
                if ( !$this->specifiedScriptPath ) {
                        $this->showMessage( 'config-no-cli-uri', $this->getVar( "wgScriptPath" ) );
                }
+
                return parent::envCheckPath();
        }
 
        protected function envGetDefaultServer() {
-               return $this->getVar( 'wgServer' );
+               return null; // Do not guess if installing from CLI
        }
 
        public function dirIsExecutable( $dir, $url ) {
                $this->showMessage( 'config-no-cli-uploads-check', $dir );
+
                return false;
        }
 }