Follow-up r86347: fix undefined variable by actually returning the type suggested...

[lhc/web/wiklou.git] / config / index.php

diff --git a/config/index.php b/config/index.php
index 95faba8..948fe69 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -1,50 +1 @@
-<?php
-/**
- * New version of MediaWiki web-based config/installation
- *
- * @file
- */
-
-define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
-define( 'MEDIAWIKI_INSTALL', true );
-
-chdir( dirname( dirname( __FILE__ ) ) );
-require( dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php' );
-
-wfInstallerMain();
-
-function wfInstallerMain() {
-       global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
-
-       $installer = new WebInstaller( $wgRequest );
-
-       if ( !$installer->startSession() ) {
-               $installer->finish();
-               exit;
-       }
-
-       $fingerprint = $installer->getFingerprint();
-       if ( isset( $_SESSION['installData'][$fingerprint] ) ) {
-               $session = $_SESSION['installData'][$fingerprint];
-       } else {
-               $session = 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 );
-
-       $installer->setParserLanguage( $wgLang->getCode() );
-
-       $wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
-
-       $session = $installer->execute( $session );
-
-       $_SESSION['installData'][$fingerprint] = $session;
-
-}
+<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php' );
\ No newline at end of file