From: Mark A. Hershberger Date: Fri, 18 Mar 2011 20:58:12 +0000 (+0000) Subject: Followup r83536 to address Jack Phoenix's comments about the bogus w/s “cleanup” X-Git-Tag: 1.31.0-rc.0~31342 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=2e61719bdb7b0c9a0b0192b6e47d23fc09e565b3;p=lhc%2Fweb%2Fwiklou.git 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 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.