Merge "Allow users with 'viewsuppressed' to view when limitTitle()d"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Jun 2015 14:01:11 +0000 (14:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Jun 2015 14:01:11 +0000 (14:01 +0000)
includes/logging/LogPager.php

index c4ce7b3..598a45f 100644 (file)
@@ -248,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;
                }