r75438 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r75437‎ | r75438 | r75439 >
Date:16:24, 26 October 2010
Author:demon
Status:ok
Tags:
Comment:
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.
Modified paths:
  • /trunk/phase3/config/index.php (added) (history)
  • /trunk/phase3/config/new-index.php (deleted) (history)

Diff [purge]

Index: trunk/phase3/config/new-index.php
——@@ -1,37 +0,0 @@
2 -<?php
3 -/**
4 - * New version of MediaWiki web-based config/installation
5 - *
6 - * @file
7 - */
8 -
9 -define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
10 -define( 'MEDIAWIKI_INSTALL', true );
11 -
12 -chdir( ".." );
13 -require( './includes/WebStart.php' );
14 -
15 -$installer = new WebInstaller( $wgRequest );
16 -
17 -if ( !$installer->startSession() ) {
18 - $installer->finish();
19 - exit;
20 -}
21 -
22 -$session = isset( $_SESSION['installData'] ) ? $_SESSION['installData'] : array();
23 -
24 -if ( isset( $session['settings']['_UserLang'] ) ) {
25 - $langCode = $session['settings']['_UserLang'];
26 -} elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
27 - $langCode = $wgRequest->getVal( 'UserLang' );
28 -} else {
29 - $langCode = 'en';
30 -}
31 -$wgLang = Language::factory( $langCode );
32 -
33 -$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
34 -
35 -$session = $installer->execute( $session );
36 -
37 -$_SESSION['installData'] = $session;
38 -
Index: trunk/phase3/config/index.php
——@@ -0,0 +1,37 @@
 2+<?php
 3+/**
 4+ * New version of MediaWiki web-based config/installation
 5+ *
 6+ * @file
 7+ */
 8+
 9+define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
 10+define( 'MEDIAWIKI_INSTALL', true );
 11+
 12+chdir( ".." );
 13+require( './includes/WebStart.php' );
 14+
 15+$installer = new WebInstaller( $wgRequest );
 16+
 17+if ( !$installer->startSession() ) {
 18+ $installer->finish();
 19+ exit;
 20+}
 21+
 22+$session = isset( $_SESSION['installData'] ) ? $_SESSION['installData'] : array();
 23+
 24+if ( isset( $session['settings']['_UserLang'] ) ) {
 25+ $langCode = $session['settings']['_UserLang'];
 26+} elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
 27+ $langCode = $wgRequest->getVal( 'UserLang' );
 28+} else {
 29+ $langCode = 'en';
 30+}
 31+$wgLang = Language::factory( $langCode );
 32+
 33+$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
 34+
 35+$session = $installer->execute( $session );
 36+
 37+$_SESSION['installData'] = $session;
 38+
Property changes on: trunk/phase3/config/index.php
___________________________________________________________________
Added: svn:eol-style
139 + native

Status & tagging log