From 95127dca459a673e964688f0d3c6361292b90958 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Mon, 1 Oct 2007 14:10:02 +0000 Subject: [PATCH] * Do, what the comment already says: Don't bother the user with a warning about a previously deleted file if the file exists now, however. --- includes/SpecialUpload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php index 30fdc3c125..31e2be1fd1 100644 --- a/includes/SpecialUpload.php +++ b/includes/SpecialUpload.php @@ -639,9 +639,9 @@ class UploadForm { } } - if ( $file->wasDeleted() ) { + if ( $file->wasDeleted() && !$file->exists() ) { # If the file existed before and was deleted, warn the user of this - # Don't bother doing so if the image exists now, however + # Don't bother doing so if the file exists now, however $ltitle = SpecialPage::getTitleFor( 'Log' ); $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); -- 2.20.1