From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 12 Aug 2010 12:58:27 +0000 (+0000)
Subject: (bug 24766) Installer is installing all extensions, not just the ones you picked
X-Git-Tag: 1.31.0-rc.0~35534
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=fc00ab67eb8f2af8e27fa1b3163c1a8fb21030e4;p=lhc%2Fweb%2Fwiklou.git

(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 90aeec7e80..c3c8e36560 100644
--- 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 52258ce5ac..f363d9ca4b 100644
--- 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;
 	}