Merge remote-tracking branch 'upstream/2021.06-rc' into forum-handling

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 8e89895ded26fb68eb8eeb71610536d4cd4732a4..935bd11d6355c6ab16df816e229deab494d7b5ad 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -44,6 +44,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Model\Verb;
+use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ExpectationFailedException;
@@ -88,6 +89,11 @@ $called_api = [];
  */
 function api_user()
 {
+       $user = BaseApi::getCurrentUserID(true);
+       if (!empty($user)) {
+               return $user;
+       }
+
        if (!empty($_SESSION['allow_api'])) {
                return local_user();
        }