| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -271,8 +271,6 @@ |
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | | - $this->setVar( '_Extensions', $exts ); |
| 276 | | - |
| 277 | 275 | return $exts; |
| 278 | 276 | } |
| 279 | 277 | |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -792,13 +792,14 @@ |
| 793 | 793 | $this->setVar( 'wgRightsIcon', '' ); |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | | - $exts = $this->parent->getVar( '_Extensions' ); |
| 797 | | - foreach( $exts as $key => $ext ) { |
| 798 | | - if( !$this->parent->request->getCheck( 'config_ext-' . $ext ) ) { |
| 799 | | - unset( $exts[$key] ); |
| | 796 | + $extsAvailable = $this->parent->findExtensions(); |
| | 797 | + $extsToInstall = array(); |
| | 798 | + foreach( $extsAvailable as $ext ) { |
| | 799 | + if( $this->parent->request->getCheck( 'config_ext-' . $ext ) ) { |
| | 800 | + $extsToInstall[] = $ext; |
| 800 | 801 | } |
| 801 | 802 | } |
| 802 | | - $this->parent->setVar( '_Extensions', $exts ); |
| | 803 | + $this->parent->setVar( '_Extensions', $extsToInstall ); |
| 803 | 804 | return true; |
| 804 | 805 | } |
| 805 | 806 | |