diff options
| author | Ppchelko <ppchelko@wikimedia.org> | 2021-01-12 04:48:49 +0000 |
|---|---|---|
| committer | Ppchelko <ppchelko@wikimedia.org> | 2021-01-12 04:48:49 +0000 |
| commit | bdb5f394d3dd2d4f25bcdf6a9f2a86fc7cc6bc09 (patch) | |
| tree | c22dc9bbbb329eb12e90ee67f3063f1482a82f63 /includes/api/ApiQueryAllImages.php | |
| parent | 900c6663b05b6a33498a81c187ac027209dd6502 (diff) | |
| download | mediawikicore-bdb5f394d3dd2d4f25bcdf6a9f2a86fc7cc6bc09.tar.gz mediawikicore-bdb5f394d3dd2d4f25bcdf6a9f2a86fc7cc6bc09.zip | |
Revert "Enhance GroupPermissionsLookup and use it."
This reverts commit 900c6663b05b6a33498a81c187ac027209dd6502.
Reason for revert: breaks Parsoid CI. Instead of fixing the test in presence of the FlaggedRevs hook, I would rather convert DefaultPreferencesFactory to Authority and fix the tests once instead of doing it twice.
Change-Id: Iaa440a9804c9ed97339e737162ef64ccf29ceb51
Diffstat (limited to 'includes/api/ApiQueryAllImages.php')
| -rw-r--r-- | includes/api/ApiQueryAllImages.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/includes/api/ApiQueryAllImages.php b/includes/api/ApiQueryAllImages.php index 6a931bf263f8..622b24957895 100644 --- a/includes/api/ApiQueryAllImages.php +++ b/includes/api/ApiQueryAllImages.php @@ -26,7 +26,6 @@ use MediaWiki\MediaWikiServices; use MediaWiki\ParamValidator\TypeDef\UserDef; -use MediaWiki\Permissions\GroupPermissionsLookup; use Wikimedia\Rdbms\IDatabase; /** @@ -42,20 +41,12 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase { protected $mRepo; /** - * @var GroupPermissionsLookup - */ - private $groupPermissionsLookup; - - /** * @param ApiQuery $query * @param string $moduleName */ public function __construct( ApiQuery $query, $moduleName ) { parent::__construct( $query, $moduleName, 'ai' ); - // TODO: inject - $services = MediaWikiServices::getInstance(); - $this->mRepo = $services->getRepoGroup()->getLocalRepo(); - $this->groupPermissionsLookup = $services->getGroupPermissionsLookup(); + $this->mRepo = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo(); } /** @@ -224,7 +215,7 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase { $this->addJoinConds( [ 'user_groups' => [ 'LEFT JOIN', [ - 'ug_group' => $this->groupPermissionsLookup->getGroupsWithPermission( 'bot' ), + 'ug_group' => $this->getPermissionManager()->getGroupsWithPermission( 'bot' ), 'ug_user = ' . $actorQuery['fields']['img_user'], 'ug_expiry IS NULL OR ug_expiry >= ' . $db->addQuotes( $db->timestamp() ) ] |