(bug 24766) Installer is installing all extensions, not just the ones you picked

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index 90aeec7..c3c8e36 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -271,8 +271,6 @@ abstract class CoreInstaller extends Installer {
                        }
                }
 
-               $this->setVar( '_Extensions', $exts );
-
                return $exts;
        }
 

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 52258ce..f363d9c 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -792,13 +792,14 @@ class WebInstaller_Options extends WebInstallerPage {
                        $this->setVar( 'wgRightsIcon', '' );
                }
 
-               $exts = $this->parent->getVar( '_Extensions' );
-               foreach( $exts as $key => $ext ) {
-                       if( !$this->parent->request->getCheck( 'config_ext-' . $ext ) ) {
-                               unset( $exts[$key] );
+               $extsAvailable = $this->parent->findExtensions();
+               $extsToInstall = array();
+               foreach( $extsAvailable as $ext ) {
+                       if( $this->parent->request->getCheck( 'config_ext-' . $ext ) ) {
+                               $extsToInstall[] = $ext;
                        }
                }
-               $this->parent->setVar( '_Extensions', $exts );
+               $this->parent->setVar( '_Extensions', $extsToInstall );
                return true;
        }