mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 07:24:27 +02:00
Code Issues Releases Wiki Activity

new api tests uncovered more issues, fixed tokens and discussion posts

Browse Source
This commit is contained in:
Daniel Klabbers
2018-05-16 09:36:04 +02:00
parent 30358e98c0
commit 68d1edb8fd
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controller/ShowDiscussionController.php
View File

@@ -118,7 +118,7 @@ class ShowDiscussionController extends AbstractShowController
*/
private function loadPostIds(Discussion $discussion, User $actor)
{
return $discussion->posts()->whereVisibleTo($actor)->orderBy('time')->pluck('id')->all();
return $discussion->posts()->whereVisibleTo($actor)->orderBy('created_at')->pluck('id')->all();
}
/**
@@ -172,7 +172,7 @@ class ShowDiscussionController extends AbstractShowController
{
$query = $discussion->posts()->whereVisibleTo($actor);
$query->orderBy('time')->skip($offset)->take($limit)->with($include);
$query->orderBy('created_at')->skip($offset)->take($limit)->with($include);
$posts = $query->get()->all();

2
src/Api/Controller/TokenController.php
View File

@@ -70,7 +70,7 @@ class TokenController implements ControllerInterface
$token->save();
return new JsonResponse([
'token' => $token->id,
'token' => $token->token,
'userId' => $user->id
]);
}