http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70944
Revision: 70944 Author: demon Date: 2010-08-12 12:58:27 +0000 (Thu, 12 Aug 2010) Log Message: ----------- (bug 24766) Installer is installing all extensions, not just the ones you picked Modified Paths: -------------- trunk/phase3/includes/installer/CoreInstaller.php trunk/phase3/includes/installer/WebInstallerPage.php Modified: trunk/phase3/includes/installer/CoreInstaller.php =================================================================== --- trunk/phase3/includes/installer/CoreInstaller.php 2010-08-12 12:55:55 UTC (rev 70943) +++ trunk/phase3/includes/installer/CoreInstaller.php 2010-08-12 12:58:27 UTC (rev 70944) @@ -271,8 +271,6 @@ } } - $this->setVar( '_Extensions', $exts ); - return $exts; } Modified: trunk/phase3/includes/installer/WebInstallerPage.php =================================================================== --- trunk/phase3/includes/installer/WebInstallerPage.php 2010-08-12 12:55:55 UTC (rev 70943) +++ trunk/phase3/includes/installer/WebInstallerPage.php 2010-08-12 12:58:27 UTC (rev 70944) @@ -792,13 +792,14 @@ $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; } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs