| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -639,9 +639,9 @@ |
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | |
| 643 | | - if ( $file->wasDeleted() ) { |
| | 643 | + if ( $file->wasDeleted() && !$file->exists() ) { |
| 644 | 644 | # If the file existed before and was deleted, warn the user of this |
| 645 | | - # Don't bother doing so if the image exists now, however |
| | 645 | + # Don't bother doing so if the file exists now, however |
| 646 | 646 | $ltitle = SpecialPage::getTitleFor( 'Log' ); |
| 647 | 647 | $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), |
| 648 | 648 | 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); |