Merge "Declare dynamic properties"

diff --combined includes/logging/LogPager.php
index 47aed56,1e58637..5e9fdb8
--- 1/includes/logging/LogPager.php
--- 2/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@@ -53,6 -53,12 +53,12 @@@ class LogPager extends ReverseChronolog
        /** @var bool */
        private $actionRestrictionsEnforced = false;
  
+       /** @var array */
+       private $mConds;
+ 
+       /** @var string */
+       private $mTagFilter;
+ 
        /** @var LogEventsList */
        public $mLogEventsList;
  
@@@ -146,9 -152,7 +152,9 @@@
                $needReindex = false;
                foreach ( $types as $type ) {
                        if ( isset( $wgLogRestrictions[$type] )
 -                              && !$user->isAllowed( $wgLogRestrictions[$type] )
 +                              && !MediaWikiServices::getInstance()
 +                                      ->getPermissionManager()
 +                                      ->userHasRight( $user, $wgLogRestrictions[$type] )
                        ) {
                                $needReindex = true;
                                $types = array_diff( $types, [ $type ] );
@@@ -464,10 -468,12 +470,10 @@@
                }
                $this->actionRestrictionsEnforced = true;
                $user = $this->getUser();
 -              if ( !$user->isAllowed( 'deletedhistory' ) ) {
 +              $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 +              if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
                        $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
 -              } elseif ( !MediaWikiServices::getInstance()
 -                      ->getPermissionManager()
 -                      ->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' )
 -              ) {
 +              } elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
                        $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
                                ' != ' . LogPage::SUPPRESSED_USER;
                }
@@@ -483,10 -489,12 +489,10 @@@
                }
                $this->performerRestrictionsEnforced = true;
                $user = $this->getUser();
 -              if ( !$user->isAllowed( 'deletedhistory' ) ) {
 +              $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 +              if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
                        $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_USER ) . ' = 0';
 -              } elseif ( !MediaWikiServices::getInstance()
 -                      ->getPermissionManager()
 -                      ->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' )
 -              ) {
 +              } elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
                        $this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
                                ' != ' . LogPage::SUPPRESSED_ACTION;
                }