| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | $details = null; |
| 282 | 282 | $value = null; |
| 283 | 283 | $value = $this->internalProcessUpload( $details ); |
| 284 | | - |
| | 284 | + |
| 285 | 285 | switch($value) { |
| 286 | 286 | case self::SUCCESS: |
| 287 | 287 | $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); |
| — | — | @@ -376,11 +376,6 @@ |
| 377 | 377 | return self::BEFORE_PROCESSING; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | | - /* Check for curl error */ |
| 381 | | - if( $this->mCurlError ) { |
| 382 | | - return self::BEFORE_PROCESSING; |
| 383 | | - } |
| 384 | | - |
| 385 | 380 | /** |
| 386 | 381 | * If there was no filename or a zero size given, give up quick. |
| 387 | 382 | */ |
| — | — | @@ -388,6 +383,11 @@ |
| 389 | 384 | return self::EMPTY_FILE; |
| 390 | 385 | } |
| 391 | 386 | |
| | 387 | + /* Check for curl error */ |
| | 388 | + if( $this->mCurlError ) { |
| | 389 | + return self::BEFORE_PROCESSING; |
| | 390 | + } |
| | 391 | + |
| 392 | 392 | # Chop off any directories in the given filename |
| 393 | 393 | if( $this->mDesiredDestName ) { |
| 394 | 394 | $basename = $this->mDesiredDestName; |
| — | — | @@ -998,7 +998,7 @@ |
| 999 | 999 | $val2 = $val; |
| 1000 | 1000 | } |
| 1001 | 1001 | $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2; |
| 1002 | | - $maxUploadSize = wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escape' ), $wgLang->formatSize( $val2 ) ); |
| | 1002 | + $maxUploadSize = wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), $wgLang->formatSize( $val2 ) ); |
| 1003 | 1003 | |
| 1004 | 1004 | $sourcefilename = wfMsgExt( 'sourcefilename', 'escapenoentities' ); |
| 1005 | 1005 | $destfilename = wfMsgExt( 'destfilename', 'escapenoentities' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -142,8 +142,8 @@ |
| 143 | 143 | * (bug 13543) Updated FAQ link in the installer sidebar |
| 144 | 144 | * (bug 13540) Date format in confirmation e-mail now matches message language |
| 145 | 145 | * (bug 13554) PHP Notice in old pre-processor when list item is empty. |
| | 146 | +* (bug 13556) Don't show a blank form if no image is attached in Special:Upload |
| 146 | 147 | |
| 147 | | - |
| 148 | 148 | === API changes in 1.13 === |
| 149 | 149 | |
| 150 | 150 | * Fixing main page display in meta=siteinfo |