Whitespace fixes

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index a264cb9..63bfa54 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -23,6 +23,7 @@ $fname = 'Setup.php';
 wfProfileIn( $fname );
 
 // Check to see if we are at the file scope
+// FIXME: use a different test here, maybe a constant defined at the top of DefaultSettings.php?
 if ( !isset( $wgVersion ) ) {
        echo "Error, Setup.php must be included from the file scope, after DefaultSettings.php\n";
        die( 1 );
@@ -261,10 +262,6 @@ if ( !$wgAllowRealName ) {
        $wgHiddenPrefs[] = 'realname';
 }
 
-if ( !$wgAllowUserSkin ) {
-       $wgHiddenPrefs[] = 'skin';
-}
-
 # Doesn't make sense to have if disabled.
 if ( !$wgEnotifMinorEdits ) {
        $wgHiddenPrefs[] = 'enotifminoredits';
@@ -397,11 +394,13 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
 wfProfileOut( $fname . '-session' );
 wfProfileIn( $fname . '-globals' );
 
-$wgContLang = new StubContLang;
+$wgContLang = Language::factory( $wgLanguageCode );
+$wgContLang->initEncoding();
+$wgContLang->initContLang();
 
 // Now that variant lists may be available...
 $wgRequest->interpolateTitle();
-$wgUser = RequestContext::getMain()->user; # BackCompat
+$wgUser = RequestContext::getMain()->getUser(); # BackCompat
 
 /**
  * @var Language
@@ -411,7 +410,7 @@ $wgLang = new StubUserLang;
 /**
  * @var OutputPage
  */
-$wgOut = RequestContext::getMain()->output; # BackCompat
+$wgOut = RequestContext::getMain()->getOutput(); # BackCompat
 
 /**
  * @var Parser
@@ -432,13 +431,6 @@ $wgDeferredUpdateList = array();
 wfProfileOut( $fname . '-globals' );
 wfProfileIn( $fname . '-extensions' );
 
-# Skin setup functions
-# Entries can be added to this variable during the inclusion
-# of the extension file. Skins can then perform any necessary initialisation.
-foreach ( $wgSkinExtensionFunctions as $func ) {
-       call_user_func( $func );
-}
-
 # Extension setup functions for extensions other than skins
 # Entries should be added to this variable during the inclusion
 # of the extension file. This allows the extension to perform
@@ -461,12 +453,6 @@ foreach ( $wgExtensionFunctions as $func ) {
        wfProfileOut( $profName );
 }
 
-// For compatibility
-wfRunHooks( 'LogPageValidTypes', array( &$wgLogTypes ) );
-wfRunHooks( 'LogPageLogName', array( &$wgLogNames ) );
-wfRunHooks( 'LogPageLogHeader', array( &$wgLogHeaders ) );
-wfRunHooks( 'LogPageActionText', array( &$wgLogActions ) );
-
 wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
 wfProfileOut( $fname . '-extensions' );