X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Flogging%2FLogPager.php;h=5e9fdb8d0399f4ddf3b45fb2753756fc880f5a96;hb=260a734173bcc6b414aafb92de559505fe47bafc;hp=4ecc368d4e847f63b2039391d33336dcb317c4d4;hpb=04d1aa3033f40a38d721f7f0e88b5bac440d2869;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index 4ecc368d4e..5e9fdb8d03 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -23,6 +23,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @ingroup Pager
  */
@@ -51,6 +53,12 @@ class LogPager extends ReverseChronologicalPager {
 	/** @var bool */
 	private $actionRestrictionsEnforced = false;
 
+	/** @var array */
+	private $mConds;
+
+	/** @var string */
+	private $mTagFilter;
+
 	/** @var LogEventsList */
 	public $mLogEventsList;
 
@@ -144,7 +152,9 @@ class LogPager extends ReverseChronologicalPager {
 		$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 ] );
@@ -256,7 +266,7 @@ class LogPager extends ReverseChronologicalPager {
 				$params[] = $db->anyString();
 			}
 			array_pop( $params ); // Get rid of the last % we added.
-			$this->mConds[] = 'log_title' . $db->buildLike( $params );
+			$this->mConds[] = 'log_title' . $db->buildLike( ...$params );
 		} elseif ( $pattern && !$wgMiserMode ) {
 			$this->mConds[] = 'log_title' . $db->buildLike( $title->getDBkey(), $db->anyString() );
 			$this->pattern = $pattern;
@@ -460,9 +470,10 @@ class LogPager extends ReverseChronologicalPager {
 		}
 		$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 ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
+		} elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
 			$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
 				' != ' . LogPage::SUPPRESSED_USER;
 		}
@@ -478,9 +489,10 @@ class LogPager extends ReverseChronologicalPager {
 		}
 		$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 ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
+		} elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
 			$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
 				' != ' . LogPage::SUPPRESSED_ACTION;
 		}