From 2e61719bdb7b0c9a0b0192b6e47d23fc09e565b3 Mon Sep 17 00:00:00 2001
From: "Mark A. Hershberger" <mah@users.mediawiki.org>
Date: Fri, 18 Mar 2011 20:58:12 +0000
Subject: [PATCH] =?utf8?q?Followup=20r83536=20to=20address=20Jack=20Phoeni?=
 =?utf8?q?x's=20comments=20about=20the=20bogus=20w/s=20=E2=80=9Ccleanup?=
 =?utf8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 includes/Import.php             | 2 +-
 includes/upload/UploadBase.php  | 2 +-
 includes/upload/UploadStash.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/Import.php b/includes/Import.php
index 115cf158d9..6d9c95cf49 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1072,7 +1072,7 @@ class WikiRevision {
 			return false;
 		}
 
-			   $user = User::newFromName( $this->user_text );
+		$user = User::newFromName( $this->user_text );
 
 		$status = $file->upload( $source,
 			$this->getComment(),
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index adc1ff2b1d..5e5c32d4eb 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1310,7 +1310,7 @@ abstract class UploadBase {
 		global $wgMaxUploadSize;
 
 		if ( is_array( $wgMaxUploadSize ) ) {
-			if ( !is_null( $forType) && isset( $wgMaxUploadSize[$forType] ) ) {
+			if ( !is_null( $forType ) && isset( $wgMaxUploadSize[$forType] ) ) {
 				return $wgMaxUploadSize[$forType];
 			} else {
 				return $wgMaxUploadSize['*'];
diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 5c8ae2ef39..dfcfec0d77 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -102,7 +102,7 @@ class UploadStash {
 			wfDebug( "UploadStash: tried to stash file at '$path', but it doesn't exist\n" );
 			throw new UploadStashBadPathException( "path doesn't exist" );
 		}
-				$fileProps = File::getPropsFromPath( $path );
+		$fileProps = File::getPropsFromPath( $path );
 
 		// we will be initializing from some tmpnam files that don't have extensions.
 		// most of MediaWiki assumes all uploaded files have good extensions. So, we fix this.
-- 
2.20.1