| Index: trunk/phase3/includes/installer/LocalSettingsGenerator.php |
| — | — | @@ -46,6 +46,7 @@ |
| 47 | 47 | 'wgRightsText', 'wgRightsCode', 'wgMainCacheType', 'wgEnableUploads', |
| 48 | 48 | 'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser', |
| 49 | 49 | 'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin', |
| | 50 | + 'wgMetaNamespace' |
| 50 | 51 | ), |
| 51 | 52 | $db->getGlobalNames() |
| 52 | 53 | ); |
| — | — | @@ -171,6 +172,10 @@ |
| 172 | 173 | |
| 173 | 174 | $rights = $this->values['wgRightsUrl'] ? '' : '#'; |
| 174 | 175 | $hashedUploads = $this->safeMode ? '' : '#'; |
| | 176 | + $metaNamespace = ''; |
| | 177 | + if( $this->values['wgMetaNamespace'] !== $this->values['wgSitename'] ) { |
| | 178 | + $metaNamespace = "\$wgMetaNamespace = \"{$this->values['wgMetaNamespace']}\";\n"; |
| | 179 | + } |
| 175 | 180 | |
| 176 | 181 | switch( $this->values['wgMainCacheType'] ) { |
| 177 | 182 | case 'anything': |
| — | — | @@ -205,8 +210,8 @@ |
| 206 | 211 | ## Uncomment this to disable output compression |
| 207 | 212 | # \$wgDisableOutputCompression = true; |
| 208 | 213 | |
| 209 | | -\$wgSitename = \"{$this->values['wgSitename']}\"; |
| 210 | | - |
| | 214 | +\$wgSitename = \"{$this->values['wgSitename']}\"; |
| | 215 | +{$metaNamespace} |
| 211 | 216 | ## The URL base path to the directory containing the wiki; |
| 212 | 217 | ## defaults for all runtime URL paths are based off of this. |
| 213 | 218 | ## For more information on customizing the URLs please see: |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -624,7 +624,7 @@ |
| 625 | 625 | $retVal = true; |
| 626 | 626 | $this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType', |
| 627 | 627 | '_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail', |
| 628 | | - '_Subscribe', '_SkipOptional' ) ); |
| | 628 | + '_Subscribe', '_SkipOptional', 'wgMetaNamespace' ) ); |
| 629 | 629 | |
| 630 | 630 | // Validate site name |
| 631 | 631 | if ( strval( $this->getVar( 'wgSitename' ) ) === '' ) { |