Followup r83536 to address Jack Phoenix's comments about the bogus w/s “cleanup”

diff --git a/includes/Import.php b/includes/Import.php
index 115cf15..6d9c95c 100644 (file)
--- 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 adc1ff2..5e5c32d 100644 (file)
--- 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 5c8ae2e..dfcfec0 100644 (file)
--- 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.