From 8ca8fd164c3d45d139de26c12f63fe3b940e3b9e Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Sun, 19 Dec 2010 05:32:55 +0000 Subject: [PATCH] Not sure how I missed --scriptpath option since it was right above the wikiroot option I added, but I did. (ok, so I *do* know how I missed it, but it was a dumb mistake). --- includes/installer/CliInstaller.php | 1 - maintenance/install.php | 1 - 2 files changed, 2 deletions(-) diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 3bc45b9839..af50f80515 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -32,7 +32,6 @@ class CliInstaller extends CoreInstaller { 'dbts2schema' => 'wgDBts2schema', 'dbpath' => 'wgSQLiteDataDir', 'scriptpath' => 'wgScriptPath', - 'wikiroot' => 'wgScriptPath', 'upgrade' => 'cliUpgrade', /* As long as it isn't $confItems * in LocalSettingsGenerator, we * should be fine. */ diff --git a/maintenance/install.php b/maintenance/install.php index 8834ed324b..ef0e71e128 100644 --- a/maintenance/install.php +++ b/maintenance/install.php @@ -49,7 +49,6 @@ class CommandLineInstaller extends Maintenance { $this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true ); $this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true ); $this->addOption( 'confpath', "Path to write LocalSettings.php to, default $IP", false, true ); - $this->addOption( 'wikiroot', "The URL to use for the wiki root (/wiki)", false, true ); /* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */ /* $this->addOption( 'dbtsearch2schema', 'The schema for the tsearch2 DB in pg (public)', false, true ); */ /* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */ -- 2.20.1