* Only show most recent 5000 revisions on Special:Undelete by default. Accept
limit and offset parameters. Undelete with no revisions selected still
undeletes all revisions, regardless of how many are displayed.
+* Add "show all" option to Special:Undelete when some revisions are excluded,
+ despite that showing all revisions may fail less than gracefully.
=== Bug fixes in 1.12 ===
'ar_title' => $this->title->getDBkey() );
if ( $startTime && is_numeric($startTime) )
$whereClause[] = "ar_timestamp < $startTime";
-
+
+ $optionsClause = array( 'ORDER BY' => 'ar_timestamp DESC' );
+ if ( $limit > 0 ) $optionsClause['LIMIT'] = intval($limit);
+
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'archive',
array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment', 'ar_len' ),
$whereClause,
'PageArchive::listRevisions',
- array( 'ORDER BY' => 'ar_timestamp DESC',
- 'LIMIT' => intval($limit) ) );
+ $optionsClause ) ;
$ret = $dbr->resultObject( $res );
return $ret;
}
$tmpLimit = (is_null($tmpLimit))? 5001 : $tmpLimit + 1;
$revisions = $archive->listRevisions( $wgRequest->getVal ( 'offset' ),
$tmpLimit );
+ if ( $tmpLimit < 1 ) $tmpLimit = $revisions->numRows() + 1;
+
$files = $archive->listFiles();
$haveRevisions = $revisions && $revisions->numRows() > 0;
$offset = 0;
$titleObj = SpecialPage::getTitleFor ( 'Undelete' );
- $tmplink = $sk->makeKnownLinkObj ( $titleObj, wfMsg( 'undelete-next-revs', 5000 ),
+ $nextLink = $sk->makeKnownLinkObj ( $titleObj, wfMsg( 'undelete-next-revs', 5000 ),
"target={$this->mTarget}&limit=5000&offset=$offset" );
+
+ $allLink = $sk->makeKnownLinkObj ( $titleObj, wfMsg( 'undelete-show-all' ),
+ "target={$this->mTarget}&limit=-1&offset=0" );
- $wgOut->addHTML ( wfMsg ( 'undelete-more-revs', $tmpLimit - 1, $tmplink ) );
+ $wgOut->addHTML ( wfMsg ( 'undelete-more-revs', $tmpLimit - 1, $nextLink, $allLink ) );
$hasMore = true;
}
# Batch existence check on user and talk pages
'undelete-error-short' => 'Error undeleting file: $1',
'undelete-error-long' => "Errors were encountered while undeleting the file:\n\n$1",
'undelete-more-revs' => '<b><font style="color: red">WARNING!</font> This page has more deleted revisions than are displayed here.</b><br />
-$1 revisions are displayed below. You may select revisions from this list or select none to restore all revisions (including those not displayed). ($2)',
+$1 revisions are displayed below. You may select revisions from this list or select none to restore all revisions (including those not displayed).<br />
+($2) ($3)',
'undelete-next-revs' => 'View next $1 revisions',
+'undelete-show-all' => 'Show all revisions',
# Namespace form on various pages
'namespace' => 'Namespace:',