(bug 26939) $wgMetaNamespace is not being generated

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 6c49fbd..37ddd61 100644 (file)
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -46,6 +46,7 @@ class LocalSettingsGenerator {
                                'wgRightsText', 'wgRightsCode', 'wgMainCacheType', 'wgEnableUploads',
                                'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser',
                                'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin',
+                               'wgMetaNamespace'
                        ),
                        $db->getGlobalNames()
                );
@@ -171,6 +172,10 @@ class LocalSettingsGenerator {
 
                $rights = $this->values['wgRightsUrl'] ? '' : '#';
                $hashedUploads = $this->safeMode ? '' : '#';
+               $metaNamespace = '';
+               if( $this->values['wgMetaNamespace'] !== $this->values['wgSitename'] ) {
+                       $metaNamespace = "\$wgMetaNamespace = \"{$this->values['wgMetaNamespace']}\";\n";
+               }
 
                switch( $this->values['wgMainCacheType'] ) {
                        case 'anything':
@@ -205,8 +210,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 ## Uncomment this to disable output compression
 # \$wgDisableOutputCompression = true;
 
-\$wgSitename         = \"{$this->values['wgSitename']}\";
-
+\$wgSitename      = \"{$this->values['wgSitename']}\";
+{$metaNamespace}
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs please see:

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 8ed0b2d..9fa81f4 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -624,7 +624,7 @@ class WebInstaller_Name extends WebInstallerPage {
                $retVal = true;
                $this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType',
                        '_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail',
-                       '_Subscribe', '_SkipOptional' ) );
+                       '_Subscribe', '_SkipOptional', 'wgMetaNamespace' ) );
 
                // Validate site name
                if ( strval( $this->getVar( 'wgSitename' ) ) === '' ) {