| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -44,6 +44,8 @@ |
| 45 | 45 | * @param $option Array |
| 46 | 46 | */ |
| 47 | 47 | function __construct( $siteName, $admin = null, array $option = array() ) { |
| | 48 | + global $wgContLang; |
| | 49 | + |
| 48 | 50 | parent::__construct(); |
| 49 | 51 | |
| 50 | 52 | foreach ( $this->optionMap as $opt => $global ) { |
| — | — | @@ -54,7 +56,7 @@ |
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 | if ( isset( $option['lang'] ) ) { |
| 58 | | - global $wgLang, $wgContLang, $wgLanguageCode; |
| | 60 | + global $wgLang, $wgLanguageCode; |
| 59 | 61 | $this->setVar( '_UserLang', $option['lang'] ); |
| 60 | 62 | $wgContLang = Language::factory( $option['lang'] ); |
| 61 | 63 | $wgLang = Language::factory( $option['lang'] ); |
| — | — | @@ -63,6 +65,12 @@ |
| 64 | 66 | |
| 65 | 67 | $this->setVar( 'wgSitename', $siteName ); |
| 66 | 68 | |
| | 69 | + $metaNS = $wgContLang->ucfirst( str_replace( ' ', '_', $siteName ) ); |
| | 70 | + if ( $metaNS == 'MediaWiki' ) { |
| | 71 | + $metaNS = 'Project'; |
| | 72 | + } |
| | 73 | + $this->setVar( 'wgMetaNamespace', $metaNS ); |
| | 74 | + |
| 67 | 75 | if ( $admin ) { |
| 68 | 76 | $this->setVar( '_AdminName', $admin ); |
| 69 | 77 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -198,8 +198,9 @@ |
| 199 | 199 | * (bug 28034) uploading file to local wiki when file exists on shared repository |
| 200 | 200 | (commons) gives spurious info in the warning message |
| 201 | 201 | * Usernames get lost when selecting different sorts on Special:listfiles |
| 202 | | -* (Bug 14005) editing section 0 of an existing but empty page gives no such |
| | 202 | +* (bug 14005) editing section 0 of an existing but empty page gives no such |
| 203 | 203 | section error |
| | 204 | +* (bug 26939) Installer does not set $wgMetaNamespace |
| 204 | 205 | |
| 205 | 206 | === API changes in 1.18 === |
| 206 | 207 | * (bug 26339) Throw warning when truncating an overlarge API result |