(bug 24687) Remove spurious require() calls. Everything in StubObject is a class...

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 1c7ec74..133be74 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -54,9 +54,10 @@ if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 
 if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
 if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
+if( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
 
-if ( empty( $wgFileStore['deleted']['directory'] ) ) {
-       $wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
+if( isset( $wgFileStore['deleted']['directory'] ) ) {
+       $wgDeletedDirectory = $wgFileStore['deleted']['directory'];
 }
 
 /**
@@ -80,16 +81,23 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
+       if( isset( $wgFileStore['deleted']['hash'] ) ) {
+               $deletedHashLevel = $wgFileStore['deleted']['hash'];
+       } else {
+               $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
+       }
        $wgLocalFileRepo = array(
                'class' => 'LocalRepo',
                'name' => 'local',
                'directory' => $wgUploadDirectory,
+               'scriptDirUrl' => $wgScriptPath,
+               'scriptExtension' => $wgScriptExtension,
                'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
                'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
                'thumbScriptUrl' => $wgThumbnailScriptPath,
                'transformVia404' => !$wgGenerateThumbnailOnParse,
-               'deletedDir' => $wgFileStore['deleted']['directory'],
-               'deletedHashLevels' => $wgFileStore['deleted']['hash']
+               'deletedDir' => $wgDeletedDirectory,
+               'deletedHashLevels' => $deletedHashLevel
        );
 }
 /**
@@ -158,7 +166,6 @@ require_once( "$IP/includes/Namespace.php" );
 require_once( "$IP/includes/ProxyTools.php" );
 require_once( "$IP/includes/ObjectCache.php" );
 require_once( "$IP/includes/ImageFunctions.php" );
-require_once( "$IP/includes/StubObject.php" );
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
 
@@ -297,13 +304,15 @@ $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 if( !wfIniGetBool( 'session.auto_start' ) )
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
-if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
-       wfIncrStats( 'request_with_session' );
-       wfSetupSession();
-       $wgSessionStarted = true;
-} else {
-       wfIncrStats( 'request_without_session' );
-       $wgSessionStarted = false;
+if( !defined( 'MW_NO_SESSION' ) ) {
+       if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
+               wfIncrStats( 'request_with_session' );
+               wfSetupSession();
+               $wgSessionStarted = true;
+       } else {
+               wfIncrStats( 'request_without_session' );
+               $wgSessionStarted = false;
+       }
 }
 
 wfProfileOut( $fname.'-SetupSession' );