Moved constant values from initialiseFromUser() to class definition

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

diff --git a/includes/Setup.php b/includes/Setup.php
index b937c0e..d28b339 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -217,9 +217,14 @@ if ( $wgCommandLineMode ) {
        wfDebug( "Start request\n\n" );
        # Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
        # so use an alternative
-       $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] :
-               ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] :
-               $_SERVER['PHP_SELF'] );
+       if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+               $requestUri = $_SERVER['REQUEST_URI'];
+       } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+               $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+       } else {
+               $requestUri = $_SERVER['PHP_SELF'];
+       }
+
        wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
 
        if ( $wgDebugPrintHttpHeaders ) {
@@ -289,6 +294,9 @@ if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
        else $wgHtml5Version = 'HTML+RDFa 1.0';
 }
 
+if ( $wgInvalidateCacheOnLocalSettingsChange ) {
+       $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) );
+}
 
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
@@ -376,7 +384,6 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-misc2' );
 
 $wgDeferredUpdateList = array();
-$wgPostCommitUpdateList = array();
 
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';