Skip to content
Snippets Groups Projects
Commit 3f214ebf authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3430

Closes #3430

Merge request studip/studip!2333
parent 336454c6
No related branches found
No related tags found
No related merge requests found
...@@ -16,11 +16,11 @@ use Studip\Activity\UserContext; ...@@ -16,11 +16,11 @@ use Studip\Activity\UserContext;
function canShowActivityStream(\User $observer, string $userId): bool function canShowActivityStream(\User $observer, string $userId): bool
{ {
if (!$GLOBALS['perm']->have_perm('root', $observer->id)) { if ($GLOBALS['perm']->have_perm('root', $observer->id)) {
return true; return true;
} }
return $observer->id == $userId; return $observer->id === $userId;
} }
class ActivityStreamShow extends JsonApiController class ActivityStreamShow extends JsonApiController
...@@ -37,12 +37,12 @@ class ActivityStreamShow extends JsonApiController ...@@ -37,12 +37,12 @@ class ActivityStreamShow extends JsonApiController
throw new AuthorizationFailedException(); throw new AuthorizationFailedException();
} }
if (!$user = \User::find($userId)) { $user = \User::find($userId);
if (!$user) {
throw new RecordNotFoundException(); throw new RecordNotFoundException();
} }
$urlFilter = $this->getUrlFilter(); $urlFilter = $this->getUrlFilter();
/** @var \User $user */
$contexts = $this->createContexts($user); $contexts = $this->createContexts($user);
$filter = $this->createFilter($urlFilter); $filter = $this->createFilter($urlFilter);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment