github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-12 01:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix error if there is no included data with user

Browse Source 
i.e. if the logged in user is unconfirmed (doesn’t have any groups
attached)
This commit is contained in:
Toby Zerner 2015-03-24 16:55:22 +10:30
parent 47262c2970
commit 193bb0b085
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Web/Actions/IndexAction.php
View File

@ -33,8 +33,12 @@ class IndexAction extends Action
]; ];
$response = $this->callAction('Flarum\Api\Actions\Users\ShowAction', ['id' => $user->id]); $response = $this->callAction('Flarum\Api\Actions\Users\ShowAction', ['id' => $user->id]);
$response = $response->getData();
$data = array_merge([$response->getData()->data], $response->getData()->included); $data = [$response->data];
if (isset($response->included)) {
$data = array_merge($data, $response->included);
}
} }