X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flogging%2FLogPager.php;h=598a45f07cca43821bc67e7c514d59f51eff1a30;hp=256934e4c7cc121f9c723f966bf873f2ac9f4ff9;hb=519f901c2fb3e6a625b840daab7220212d0866da;hpb=227204c69b59dda16c6011002f8f3db7a874ded1 diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php index 256934e4c7..598a45f07c 100644 --- a/includes/logging/LogPager.php +++ b/includes/logging/LogPager.php @@ -192,7 +192,7 @@ class LogPager extends ReverseChronologicalPager { * @return void */ private function limitTitle( $page, $pattern ) { - global $wgMiserMode; + global $wgMiserMode, $wgUserrightsInterwikiDelimiter; if ( $page instanceof Title ) { $title = $page; @@ -209,7 +209,6 @@ class LogPager extends ReverseChronologicalPager { $doUserRightsLogLike = false; if ( $this->types == array( 'rights' ) ) { - global $wgUserrightsInterwikiDelimiter; $parts = explode( $wgUserrightsInterwikiDelimiter, $title->getDBKey() ); if ( count( $parts ) == 2 ) { list( $name, $database ) = array_map( 'trim', $parts ); @@ -249,7 +248,7 @@ class LogPager extends ReverseChronologicalPager { $user = $this->getUser(); if ( !$user->isAllowed( 'deletedhistory' ) ) { $this->mConds[] = $db->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0'; - } elseif ( !$user->isAllowed( 'suppressrevision' ) ) { + } elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) { $this->mConds[] = $db->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) . ' != ' . LogPage::SUPPRESSED_ACTION; } @@ -323,7 +322,6 @@ class LogPager extends ReverseChronologicalPager { } public function getStartBody() { - wfProfileIn( __METHOD__ ); # Do a link batch query if ( $this->getNumRows() > 0 ) { $lb = new LinkBatch; @@ -339,7 +337,6 @@ class LogPager extends ReverseChronologicalPager { $lb->execute(); $this->mResult->seek( 0 ); } - wfProfileOut( __METHOD__ ); return ''; }