diff options
Diffstat (limited to 'includes/installer/CliInstaller.php')
| -rw-r--r-- | includes/installer/CliInstaller.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 38b4a824..f944fbed 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -114,7 +114,7 @@ class CliInstaller extends Installer { */ public function execute() { $vars = Installer::getExistingLocalSettings(); - if( $vars ) { + if ( $vars ) { $this->showStatusMessage( Status::newFatal( "config-localsettings-cli-upgrade" ) ); @@ -129,7 +129,7 @@ class CliInstaller extends Installer { /** * Write LocalSettings.php to a given path * - * @param $path String Full path to write LocalSettings.php to + * @param string $path Full path to write LocalSettings.php to */ public function writeConfigurationFile( $path ) { $ls = InstallerOverrides::getLocalSettingsGenerator( $this ); @@ -137,6 +137,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 $this->showMessage( "config-install-$step" ); } @@ -166,6 +168,7 @@ class CliInstaller extends Installer { $text = wfMessage( $msg, $params )->parse(); $text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text ); + return html_entity_decode( strip_tags( $text ), ENT_QUOTES ); } @@ -191,19 +194,21 @@ class CliInstaller extends Installer { } } - public function envCheckPath( ) { + public function envCheckPath() { if ( !$this->specifiedScriptPath ) { - $this->showMessage( 'config-no-cli-uri', $this->getVar("wgScriptPath") ); + $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; } } |