From: umherirrender Date: Fri, 21 Sep 2012 13:16:29 +0000 (+0200) Subject: Do not use Checkboxes for user without deletelogentry in log X-Git-Tag: 1.31.0-rc.0~22320 X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=27b9ecc6f90196197d3397d64cf9ce73cd44ea6e;p=lhc%2Fweb%2Fwiklou.git Do not use Checkboxes for user without deletelogentry in log When a user has only deletedhistory and not deletelogentry he should not see checkboxes, because the button at the begin of the page is missing and than the checkbox is useless. Use links instead, as the history page does. Change-Id: Icae8267dcf3032437eae08372ddbe5769bed7a86 --- diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index 4de1a9748c..c478b43212 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -351,9 +351,9 @@ class LogEventsList extends ContextSource { $user = $this->getUser(); // Don't show useless checkbox to people who cannot hide log entries if( $user->isAllowed( 'deletedhistory' ) ) { - if( $row->log_deleted || $user->isAllowed( 'deletelogentry' ) ) { - $canHide = $user->isAllowed( 'deletelogentry' ); - if ( $this->flags & self::USE_REVDEL_CHECKBOXES ) { // Show checkboxes instead of links. + $canHide = $user->isAllowed( 'deletelogentry' ); + if( $row->log_deleted || $canHide ) { + if ( $canHide && $this->flags & self::USE_REVDEL_CHECKBOXES ) { // Show checkboxes instead of links. if ( !self::userCan( $row, LogPage::DELETED_RESTRICTED, $user ) ) { // If event was hidden from sysops $del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) ); } else {