| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -1310,7 +1310,7 @@ |
| 1311 | 1311 | global $wgMaxUploadSize; |
| 1312 | 1312 | |
| 1313 | 1313 | if ( is_array( $wgMaxUploadSize ) ) { |
| 1314 | | - if ( !is_null( $forType) && isset( $wgMaxUploadSize[$forType] ) ) { |
| | 1314 | + if ( !is_null( $forType ) && isset( $wgMaxUploadSize[$forType] ) ) { |
| 1315 | 1315 | return $wgMaxUploadSize[$forType]; |
| 1316 | 1316 | } else { |
| 1317 | 1317 | return $wgMaxUploadSize['*']; |
| Index: trunk/phase3/includes/upload/UploadStash.php |
| — | — | @@ -102,7 +102,7 @@ |
| 103 | 103 | wfDebug( "UploadStash: tried to stash file at '$path', but it doesn't exist\n" ); |
| 104 | 104 | throw new UploadStashBadPathException( "path doesn't exist" ); |
| 105 | 105 | } |
| 106 | | - $fileProps = File::getPropsFromPath( $path ); |
| | 106 | + $fileProps = File::getPropsFromPath( $path ); |
| 107 | 107 | |
| 108 | 108 | // we will be initializing from some tmpnam files that don't have extensions. |
| 109 | 109 | // most of MediaWiki assumes all uploaded files have good extensions. So, we fix this. |
| Index: trunk/phase3/includes/Import.php |
| — | — | @@ -1072,7 +1072,7 @@ |
| 1073 | 1073 | return false; |
| 1074 | 1074 | } |
| 1075 | 1075 | |
| 1076 | | - $user = User::newFromName( $this->user_text ); |
| | 1076 | + $user = User::newFromName( $this->user_text ); |
| 1077 | 1077 | |
| 1078 | 1078 | $status = $file->upload( $source, |
| 1079 | 1079 | $this->getComment(), |