Moving new-index.php to index.php. This is pretty much done and I can't see us backin...

Wanted to get more feedback before we branch. Please see http://mediawiki.org/wiki/New-installer_issues for known problems and to report other things.

diff --git a/config/index.php b/config/index.php
new file mode 100644 (file)
index 0000000..e743151
--- /dev/null
+++ b/config/index.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * New version of MediaWiki web-based config/installation
+ *
+ * @file
+ */
+
+define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
+define( 'MEDIAWIKI_INSTALL', true );
+
+chdir( ".." );
+require( './includes/WebStart.php' );
+
+$installer = new WebInstaller( $wgRequest );
+
+if ( !$installer->startSession() ) {
+       $installer->finish();
+       exit;
+}
+
+$session = isset( $_SESSION['installData'] ) ? $_SESSION['installData'] : array();
+
+if ( isset( $session['settings']['_UserLang'] ) ) {
+       $langCode = $session['settings']['_UserLang'];
+} elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
+       $langCode = $wgRequest->getVal( 'UserLang' );
+} else {
+       $langCode = 'en';
+}
+$wgLang = Language::factory( $langCode );
+
+$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
+
+$session = $installer->execute( $session );
+
+$_SESSION['installData'] = $session;
+

diff --git a/config/new-index.php b/config/new-index.php
deleted file mode 100644 (file)
index e743151..0000000
--- a/config/new-index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * New version of MediaWiki web-based config/installation
- *
- * @file
- */
-
-define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
-define( 'MEDIAWIKI_INSTALL', true );
-
-chdir( ".." );
-require( './includes/WebStart.php' );
-
-$installer = new WebInstaller( $wgRequest );
-
-if ( !$installer->startSession() ) {
-       $installer->finish();
-       exit;
-}
-
-$session = isset( $_SESSION['installData'] ) ? $_SESSION['installData'] : array();
-
-if ( isset( $session['settings']['_UserLang'] ) ) {
-       $langCode = $session['settings']['_UserLang'];
-} elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
-       $langCode = $wgRequest->getVal( 'UserLang' );
-} else {
-       $langCode = 'en';
-}
-$wgLang = Language::factory( $langCode );
-
-$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
-
-$session = $installer->execute( $session );
-
-$_SESSION['installData'] = $session;
-