* In CoreInstaller, fixed notice when extensions are present, due to incorrect format...

* In LocalSettingsGenerator, fixed PHP escaping of extension name.

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index acdef84..24b410c 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -314,7 +314,7 @@ abstract class CoreInstaller extends Installer {
                );
                if( count( $this->getVar( '_Extensions' ) ) ) {
                        array_unshift( $installSteps, 
-                               array( 'extensions', array( $this, 'includeExtensions' ) )
+                               array( 'name' => 'extensions', 'callback' => array( $this, 'includeExtensions' ) )
                        );
                }
                foreach( $installSteps as $idx => $stepObj ) {

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 820729d..e3eb957 100644 (file)
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -112,8 +112,9 @@ class LocalSettingsGenerator {
                if( count( $this->extensions ) ) {
                        $localSettings .= "\n# The following extensions were automatically enabled:\n";
                        
-                       foreach( $this->extensions as $ext ) {
-                               $localSettings .= "require( 'extensions/$ext/$ext.php' );\n";
+                       foreach( $this->extensions as $extName ) {
+                               $encExtName = self::escapePhpString( $extName );
+                               $localSettings .= "require( \"extensions/$encExtName/$encExtName.php\" );\n";
                        }
                }