Merge "Let install.php detect and inject extensions"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 7b2ece9..9ecfb3e 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -66,6 +66,8 @@ 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 32d2634..d5f0c67 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -107,6 +107,11 @@ 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 6249094..438e9dc 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -88,6 +88,8 @@ 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() {