r91566 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r91565‎ | r91566 | r91567 >
Date:17:27, 6 July 2011
Author:bawolff
Status:ok
Tags:
Comment:
(follow-up r57868) Check if there exists a deleted page if we have a filename to check, not if we don't have a filename.

Also the showDeletionLog function was removed way back and folded into a different function in special:upload, so remove the call to that.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES-1.18 (modified) (history)
  • /trunk/phase3/includes/specials/SpecialUpload.php (modified) (history)

Diff [purge]

Index: trunk/phase3/RELEASE-NOTES-1.18
@@ -259,6 +259,7 @@
260260 as the server name.
261261 * (bug 19725) Do not list suppressed edits in the "View X deleted edits" link
262262 if user cannot view suppressed edits.
 263+* The View X deleted revisions is now shown again on Special:Upload.
263264
264265 === API changes in 1.18 ===
265266 * (bug 26339) Throw warning when truncating an overlarge API result.
Index: trunk/phase3/includes/specials/SpecialUpload.php
@@ -224,7 +224,7 @@
225225 */
226226 protected function showUploadForm( $form ) {
227227 # Add links if file was previously deleted
228 - if ( !$this->mDesiredDestName ) {
 228+ if ( $this->mDesiredDestName ) {
229229 $this->showViewDeletedLinks();
230230 }
231231
@@ -330,11 +330,6 @@
331331 }
332332 }
333333 }
334 -
335 - // Show the relevant lines from deletion log (for still deleted files only)
336 - if( $title instanceof Title && $title->isDeletedQuick() && !$title->exists() ) {
337 - $this->showDeletionLog( $wgOut, $title->getPrefixedText() );
338 - }
339334 }
340335
341336 /**

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r57868Rewrote Special:Upload to allow easier extension. Mostly backwards compatible...btongminh19:41, 18 October 2009

Status & tagging log