X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryInfo.php;h=98474c763b7969c54f02944a73f8e8079473d466;hb=9c70ca60ff08060d5b32867f762d96dbc4314010;hp=90f1340eb5e95aaaa2ca1385352b87a7702af44e;hpb=98279e5b79e6db0225f2b03f65b8aefe2797d1f8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 90f1340eb5..98474c763b 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -118,6 +118,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		return $this->tokenFunctions;
 	}
 
+	/** @var string[] */
 	protected static $cachedTokens = [];
 
 	/**
@@ -135,7 +136,8 @@ class ApiQueryInfo extends ApiQueryBase {
 		// but that's too expensive for this purpose
 		// and would break caching
 		global $wgUser;
-		if ( !$wgUser->isAllowed( 'edit' ) ) {
+		if ( !MediaWikiServices::getInstance()->getPermissionManager()
+				->userHasRight( $wgUser, 'edit' ) ) {
 			return false;
 		}
 
@@ -152,7 +154,8 @@ class ApiQueryInfo extends ApiQueryBase {
 	 */
 	public static function getDeleteToken( $pageid, $title ) {
 		global $wgUser;
-		if ( !$wgUser->isAllowed( 'delete' ) ) {
+		if ( !MediaWikiServices::getInstance()->getPermissionManager()
+				->userHasRight( $wgUser, 'delete' ) ) {
 			return false;
 		}
 
@@ -169,7 +172,8 @@ class ApiQueryInfo extends ApiQueryBase {
 	 */
 	public static function getProtectToken( $pageid, $title ) {
 		global $wgUser;
-		if ( !$wgUser->isAllowed( 'protect' ) ) {
+		if ( !MediaWikiServices::getInstance()->getPermissionManager()
+				->userHasRight( $wgUser, 'protect' ) ) {
 			return false;
 		}
 
@@ -186,7 +190,8 @@ class ApiQueryInfo extends ApiQueryBase {
 	 */
 	public static function getMoveToken( $pageid, $title ) {
 		global $wgUser;
-		if ( !$wgUser->isAllowed( 'move' ) ) {
+		if ( !MediaWikiServices::getInstance()->getPermissionManager()
+				->userHasRight( $wgUser, 'move' ) ) {
 			return false;
 		}
 
@@ -203,7 +208,8 @@ class ApiQueryInfo extends ApiQueryBase {
 	 */
 	public static function getBlockToken( $pageid, $title ) {
 		global $wgUser;
-		if ( !$wgUser->isAllowed( 'block' ) ) {
+		if ( !MediaWikiServices::getInstance()->getPermissionManager()
+				->userHasRight( $wgUser, 'block' ) ) {
 			return false;
 		}
 
@@ -245,7 +251,9 @@ class ApiQueryInfo extends ApiQueryBase {
 	 */
 	public static function getImportToken( $pageid, $title ) {
 		global $wgUser;
-		if ( !$wgUser->isAllowedAny( 'import', 'importupload' ) ) {
+		if ( !MediaWikiServices::getInstance()
+			->getPermissionManager()
+			->userHasAnyRight( $wgUser, 'import', 'importupload' ) ) {
 			return false;
 		}
 
@@ -808,7 +816,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		$user = $this->getUser();
 
 		if ( $user->isAnon() || count( $this->everything ) == 0
-			|| !$user->isAllowed( 'viewmywatchlist' )
+			|| !$this->getPermissionManager()->userHasRight( $user, 'viewmywatchlist' )
 		) {
 			return;
 		}
@@ -843,7 +851,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		$user = $this->getUser();
-		$canUnwatchedpages = $user->isAllowed( 'unwatchedpages' );
+		$canUnwatchedpages = $this->getPermissionManager()->userHasRight( $user, 'unwatchedpages' );
 		$unwatchedPageThreshold = $this->getConfig()->get( 'UnwatchedPageThreshold' );
 		if ( !$canUnwatchedpages && !is_int( $unwatchedPageThreshold ) ) {
 			return;
@@ -873,7 +881,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		$user = $this->getUser();
 		$db = $this->getDB();
 
-		$canUnwatchedpages = $user->isAllowed( 'unwatchedpages' );
+		$canUnwatchedpages = $this->getPermissionManager()->userHasRight( $user, 'unwatchedpages' );
 		$unwatchedPageThreshold = $this->getConfig()->get( 'UnwatchedPageThreshold' );
 		if ( !$canUnwatchedpages && !is_int( $unwatchedPageThreshold ) ) {
 			return;