From: Hashar <hashar@free.fr>
Date: Wed, 14 Mar 2018 22:10:20 +0000 (+0000)
Subject: Revert "Let install.php detect and inject extensions"
X-Git-Tag: 1.31.0-rc.0~377^2
X-Git-Url: http://git.cyclocoop.org/%27.generer_url_ecrire%28%27admin_couteau_suisse%27%2C%27cmd=descrip&outil=boites_privees?a=commitdiff_plain;h=493c2c765f76ac5696351cba3dd9d275e2b46df4;p=lhc%2Fweb%2Fwiklou.git

Revert "Let install.php detect and inject extensions"

It is blatantly broken using non existing variables:
$installer and $options

This reverts commit 53926d9d6940eaa7f40086c9cf89af7bc726e73f.

Bug: T189567
Change-Id: Idd1f002bbd5d474f9fe386cd0e326e1fbfdec097
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9ecfb3e68e..7b2ece99b5 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -66,8 +66,6 @@ production.
     the SQL query. The ActorMigration class may also be used to get feature-flagged
     information needed to access actor-related fields during the migration
     period.
-* The CLI installer (maintenance/install.php) learned to detect and include
-  extensions. Pass --with-extensions to enable that feature.
 
 === External library changes in 1.31 ===
 
diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index d5f0c6713c..32d2634959 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -107,11 +107,6 @@ class CliInstaller extends Installer {
 			$this->setVar( '_AdminPassword', $option['pass'] );
 		}
 
-		// Detect and inject any extension found
-		if ( isset( $options['with-extensions'] ) ) {
-			$this->setVar( '_Extensions', array_keys( $installer->findExtensions() ) );
-		}
-
 		// Set up the default skins
 		$skins = array_keys( $this->findExtensions( 'skins' ) );
 		$this->setVar( '_Skins', $skins );
diff --git a/maintenance/install.php b/maintenance/install.php
index 438e9dc478..624909452a 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -88,8 +88,6 @@ class CommandLineInstaller extends Maintenance {
 			false, true );
 		*/
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
-
-		$this->addOption( 'with-extensions', "Detect and include extensions" );
 	}
 
 	public function getDbType() {