From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 26 Oct 2010 16:24:44 +0000 (+0000)
Subject: Moving new-index.php to index.php. This is pretty much done and I can't see us backin... 
X-Git-Tag: 1.31.0-rc.0~34297
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=ab46fe2c7ed71d56b2f5b42e528f07c171aec39f;p=lhc%2Fweb%2Fwiklou.git

Moving new-index.php to index.php. This is pretty much done and I can't see us backing this out of 1.17 at this point. The UI is still a little rough (hopefullly some work coming on that soon). mySQL, SQLite support is complete. Postgres is nearly complete, Oracle as well.
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
index 0000000000..e743151996
--- /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
index e743151996..0000000000
--- 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;
-