From 705514d3a79db7cf4648c584ae4bb41770415614 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 20 Apr 2008 21:14:44 +0000 Subject: [PATCH] Make a single restore link for multi-rev revisiondelete entries --- includes/LogEventsList.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index e9dfc48b88..a2f39f2655 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -255,13 +255,14 @@ class LogEventsList { $Ids = explode( ',', $paramArray[1] ); if( count($Ids) == 1 ) { $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], - wfArrayToCGI( array('target' => $title->getPrefixedDBkey(), $key => $Ids[0] ) ) ); + wfArrayToCGI( array('target' => $title->getPrefixedDBkey(), $key => $Ids[0] ) ) ); } else { - $revert .= $this->message['revdel-restore'].':'; + $revParams = ''; foreach( $Ids as $n => $id ) { - $revert .= ' '.$this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('target' => $title->getPrefixedDBkey(), $key => $id ) ) ); + $revParams .= '&oldid[]=' . intval($id); } + $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $revParams ); } $revert = "($revert)"; } @@ -269,17 +270,18 @@ class LogEventsList { } else if( self::typeAction($row,array('delete','suppress'),'event') && $wgUser->isAllowed( 'deleterevision' ) ) { if( count($paramArray) == 1 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - $revert .= $this->message['revdel-restore']; $Ids = explode( ',', $paramArray[0] ); // Link to each hidden object ID, $paramArray[1] is the url param. List if several... if( count($Ids) == 1 ) { $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], wfArrayToCGI( array('target' => $title->getPrefixedDBkey(),'logid' => $Ids[0] ) ) ); } else { + $logParams = ''; foreach( $Ids as $n => $id ) { - $revert .= $this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('target' => $title->getPrefixedDBkey(),'logid' => $id ) ) ); + $logParams .= '&logid[]=' . intval($id); } + $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $logParams ); } $revert = "($revert)"; } -- 2.20.1