X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=b948b67494d4c202c14a8c9550b06a997843f31f;hb=b409008ca594fcebac5982ad89397c74a50fc2b8;hp=5a3e00cf8c154ce4c794cb90455f8818c110329d;hpb=27f8aa732e55f0655255152fa22655fa07424c2d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/install.php b/maintenance/install.php
index 5a3e00cf8c..b948b67494 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -21,20 +21,18 @@
  * @ingroup Maintenance
  */
 
-if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
-	require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
-	wfPHPVersionError( 'cli' );
-}
+// Checking for old versions of PHP is done in Maintenance.php
+// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
+require_once dirname( __FILE__ ) . '/Maintenance.php';
 
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-require_once dirname( __DIR__ ) . '/maintenance/Maintenance.php';
-
 /**
  * Maintenance script to install and configure MediaWiki
  *
- * Default values for the options are defined in DefaultSettings.php (see the mapping in CliInstaller.php)
+ * Default values for the options are defined in DefaultSettings.php
+ * (see the mapping in CliInstaller.php)
  * Default for --dbpath (SQLite-specific) is defined in SqliteInstaller::getGlobalDefaults
  *
  * @ingroup Maintenance
@@ -85,9 +83,11 @@ class CommandLineInstaller extends Maintenance {
 			true
 		);
 		$this->addOption( 'confpath', "Path to write LocalSettings.php to ($IP)", false, true );
+		$this->addOption( 'dbschema', 'The schema for the MediaWiki DB in '
+			. 'PostgreSQL/Microsoft SQL Server (mediawiki)', false, true );
 		/*
-		$this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true );
-		$this->addOption( 'namespace', 'The project namespace (same as the "name" argument)', false, true );
+		$this->addOption( 'namespace', 'The project namespace (same as the "name" argument)',
+			false, true );
 		*/
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
 	}