| Index: branches/new-installer/phase3/includes/installer/LocalSettings.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | if( count( $this->extensions ) ) { |
| 63 | 63 | $localSettings .= "\n# The following extensions were automatically enabled:\n"; |
| 64 | 64 | foreach( $this->extensions as $ext ) { |
| 65 | | - $localSettings .= "require( '$ext/$ext.php' );\n"; |
| | 65 | + $localSettings .= "require( 'extensions/$ext/$ext.php' );\n"; |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | return file_put_contents( $this->configPath . '/LocalSettings.php', $localSettings ); |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1466,7 +1466,7 @@ |
| 1467 | 1467 | // Extensions |
| 1468 | 1468 | $exts = $this->parent->getVar( '_Extensions' ); |
| 1469 | 1469 | if( count( $exts ) ) { |
| 1470 | | - global $wgHooks; |
| | 1470 | + global $wgHooks, $wgAutoloadClasses; |
| 1471 | 1471 | $this->startStage( 'config-install-extensions' ); |
| 1472 | 1472 | $path = $this->getVar( 'IP' ) . '/extensions'; |
| 1473 | 1473 | foreach( $exts as $e ) { |