Fixed SQL Exception in UsersManager\API->getUsersPlusRole() #14900
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ss is managed by another plugin
tsteur
reviewed
Sep 19, 2019
| if ($loginsToLimit !== null && empty($loginsToLimit)) { | ||
| // if the current user is not the superuser, and getUsersWithAccessToSites() returned an empty result, | ||
| // access is managed by another plugin, and the current user cannot manage any user with UsersManager | ||
| Common::sendHeader('X-Matomo-Total-Results: 0'); |
There was a problem hiding this comment.
@MichaelHeerklotz is the header maybe still there from debugging?
There was a problem hiding this comment.
It is intentional, some lines above there is another "fast" return case that sets the header, and at the bottom the header is set also for the default case. So i adjusted the new return case to work like the others. I did not work with these custom Matomo headers before however, so I am not 100% sure when exactly to set them and how.
|
Cheers @MichaelHeerklotz |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
$loginsToLimitis an empty array, because$this->model->getUsersWithAccessToSites($adminIdSites)returned no results an SQL Exception is triggered:This change fixes this problem and sends an empty user list in this case.
Normally $loginsToLimit will never be empty, however it can happen if access is managed by another plugin, for example the GroupPermissions plugin (https://plugins.matomo.org/GroupPermissions).