From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Thu, 31 Jul 2014 19:17:42 +0000 (+0200)
Subject: Remove useless temporary variable in Setup.php
X-Git-Tag: 1.31.0-rc.0~14640
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=bd0285ea859c12cb79952df4169073fc75452e8f;p=lhc%2Fweb%2Fwiklou.git

Remove useless temporary variable in Setup.php

Also makes the definition of $wgLocalFileRepo consistent.

Change-Id: I6fc7a6e938699ded90eca577dd005a77466cbeee
---

diff --git a/includes/Setup.php b/includes/Setup.php
index d551e767b3..03c529e5e0 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -169,7 +169,6 @@ $wgLockManagers[] = array(
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
-	$deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
 	$wgLocalFileRepo = array(
 		'class' => 'LocalRepo',
 		'name' => 'local',
@@ -181,7 +180,7 @@ if ( !$wgLocalFileRepo ) {
 		'thumbScriptUrl' => $wgThumbnailScriptPath,
 		'transformVia404' => !$wgGenerateThumbnailOnParse,
 		'deletedDir' => $wgDeletedDirectory,
-		'deletedHashLevels' => $deletedHashLevel
+		'deletedHashLevels' => $wgHashedUploadDirectory ? 3 : 0
 	);
 }
 /**