Merge "Fix undefined $db"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Nov 2017 00:51:15 +0000 (00:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Nov 2017 00:51:16 +0000 (00:51 +0000)
includes/logging/LogPager.php

index 05e55de..5404f35 100644 (file)
@@ -441,9 +441,9 @@ class LogPager extends ReverseChronologicalPager {
                $this->performerRestrictionsEnforced = true;
                $user = $this->getUser();
                if ( !$user->isAllowed( 'deletedhistory' ) ) {
-                       $this->mConds[] = $db->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
                } elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
-                       $this->mConds[] = $db->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
+                       $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
                                ' != ' . LogPage::SUPPRESSED_ACTION;
                }
        }