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 9ecfb3e..7b2ece9 100644 (file)
--- 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 d5f0c67..32d2634 100644 (file)
--- 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 438e9dc..6249094 100644 (file)
--- 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() {