From a99add1f89b733a1b6ce9eb27ab2ba7e0a154e67 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 20 Apr 2008 21:47:12 +0000 Subject: [PATCH] More cleanup and simplifications --- includes/LogEventsList.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index d525f8de91..058ca01071 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -251,39 +251,27 @@ class LogEventsList { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // Different revision types use different URL params... $key = $paramArray[0]; - // Link to each hidden object ID, $paramArray[1] is the url param. List if several... + // Link to each hidden object ID, $paramArray[1] is the url param $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] ) ) ); - } else { - $revParams = ''; - foreach( $Ids as $n => $id ) { - $revParams .= '&' . urlencode($key) . '[]=' . intval($id); - } - $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], - 'target=' . $title->getPrefixedUrl() . $revParams ); + $revParams = ''; + foreach( $Ids as $n => $id ) { + $revParams .= '&' . urlencode($key) . '[]=' . urlencode($id); } - $revert = "($revert)"; + $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $revParams ) . ')'; } // Hidden log items, give review link } else if( self::typeAction($row,array('delete','suppress'),'event') && $wgUser->isAllowed( 'deleterevision' ) ) { if( count($paramArray) == 1 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); $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 ) { - $logParams .= '&logid[]=' . intval($id); - } - $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], - 'target=' . $title->getPrefixedUrl() . $logParams ); + // Link to each hidden object ID, $paramArray[1] is the url param + $logParams = ''; + foreach( $Ids as $n => $id ) { + $logParams .= '&logid[]=' . intval($id); } - $revert = "($revert)"; + $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $logParams ) . ')'; } } else { wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray, -- 2.20.1