From c3dbbc5dc058783dbd25111bbcf594b122cdc29d Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Wed, 2 Apr 2008 09:00:43 +0000 Subject: [PATCH] * Show suppress log for that page if user is allowed to see it * Force loading all messages to show log items --- includes/SpecialRevisiondelete.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index d9176b82bb..419d89a561 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -50,6 +50,14 @@ function wfSpecialRevisiondelete( $par = null ) { new FauxRequest( array( 'page' => $page->getPrefixedText(), 'type' => 'delete' ) ) ) ); $logViewer->showList( $wgOut ); + if( $wgUser->isAllowed( 'suppress' ) ){ + $wgOut->addHTML( "

" . htmlspecialchars( LogPage::logName( 'suppress' ) ) . "

\n" ); + $logViewer = new LogViewer( + new LogReader( + new FauxRequest( + array( 'page' => $page->getPrefixedText(), 'type' => 'suppress' ) ) ) ); + $logViewer->showList( $wgOut ); + } } } @@ -434,7 +442,7 @@ class RevisionDeleteForm { * @param WebRequest $request */ function showLogItems( $request ) { - global $wgOut, $wgUser, $action; + global $wgOut, $wgUser, $action, $wgMessageCache; $UserAllowed = true; $wgOut->addWikiText( wfMsgExt( 'logdelete-selected', array('parsemag'), count($this->events) ) ); @@ -455,6 +463,7 @@ class RevisionDeleteForm { while( $row = $dbr->fetchObject( $result ) ) { $logRows[$row->log_id] = $row; } + $wgMessageCache->loadAllMessages(); foreach( $this->events as $logid ) { // Don't hide from oversight log!!! if( !isset( $logRows[$logid] ) || $logRows[$logid]->log_type=='suppress' ) { -- 2.20.1