Commit e91deb68 authored by mmn's avatar mmn

Checking user properties for instanceof User

parent 403cb858
......@@ -296,7 +296,7 @@ class ApiAuthAction extends ApiAction
if (Event::handle('StartSetApiUser', array(&$user))) {
if (!empty($user)) {
if ($user instanceof User) {
if (!$user->hasRight(Right::API)) {
// TRANS: Authorization exception thrown when a user without API access tries to access the API.
throw new AuthorizationException(_('Not allowed to use API.'));
......@@ -310,7 +310,7 @@ class ApiAuthAction extends ApiAction
// By default, basic auth users have rw access
$this->access = self::READ_WRITE;
if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
if (!$this->auth_user instanceof User && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
$msg = sprintf(
"basic auth nickname = %s",
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment