X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryUsers.php;h=8e26d37e088905666b1da344b651079c06afd0e4;hb=ab2e77bb5d228683c2458bcec16559ac10cd2c01;hp=824c4d5223105fbc93ba15778d7ad5605f433064;hpb=a2c8c2969420a0f150c03f76e3a0bf9028fcda43;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index 824c4d5223..8e26d37e08 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -168,7 +168,7 @@ class ApiQueryUsers extends ApiQueryBase { } $this->addTables( 'user_groups' ); - $this->addJoinConds( [ 'user_groups' => [ 'INNER JOIN', 'ug_user=user_id' ] ] ); + $this->addJoinConds( [ 'user_groups' => [ 'JOIN', 'ug_user=user_id' ] ] ); $this->addFields( [ 'user_name' ] ); $this->addFields( UserGroupMembership::selectFields() ); $this->addWhere( 'ug_expiry IS NULL OR ug_expiry >= ' . @@ -225,7 +225,8 @@ class ApiQueryUsers extends ApiQueryBase { } if ( isset( $this->prop['rights'] ) ) { - $data[$key]['rights'] = $user->getRights(); + $data[$key]['rights'] = $this->getPermissionManager() + ->getUserPermissions( $user ); } if ( $row->ipb_deleted ) { $data[$key]['hidden'] = true;