(follow-up r57868) Check if there exists a deleted page if we have a filename to...

Also the showDeletionLog function was removed way back and folded into a different function in special:upload, so remove the call to that.

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index be122e7..d4d8f9b 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -259,6 +259,7 @@ production.
   as the server name.
 * (bug 19725) Do not list suppressed edits in the "View X deleted edits" link
   if user cannot view suppressed edits.
+* The View X deleted revisions is now shown again on Special:Upload.
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result.

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 159cdd6..c594bdc 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -224,7 +224,7 @@ class SpecialUpload extends SpecialPage {
         */
        protected function showUploadForm( $form ) {
                # Add links if file was previously deleted
-               if ( !$this->mDesiredDestName ) {
+               if ( $this->mDesiredDestName ) {
                        $this->showViewDeletedLinks();
                }
 
@@ -330,11 +330,6 @@ class SpecialUpload extends SpecialPage {
                                }
                        }
                }
-
-               // Show the relevant lines from deletion log (for still deleted files only)
-               if( $title instanceof Title && $title->isDeletedQuick() && !$title->exists() ) {
-                       $this->showDeletionLog( $wgOut, $title->getPrefixedText() );
-               }
        }
 
        /**