From f5eaabacde6f843ea5c5e89e48bf8a0d2fe19d94 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 10 Feb 2015 17:53:52 +1030 Subject: [PATCH] Always add discussion state information --- .../Api/Serializers/DiscussionSerializer.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/framework/core/src/Flarum/Api/Serializers/DiscussionSerializer.php b/framework/core/src/Flarum/Api/Serializers/DiscussionSerializer.php index 5f9221455..448a79097 100644 --- a/framework/core/src/Flarum/Api/Serializers/DiscussionSerializer.php +++ b/framework/core/src/Flarum/Api/Serializers/DiscussionSerializer.php @@ -27,21 +27,19 @@ class DiscussionSerializer extends DiscussionBasicSerializer { $attributes = parent::attributes($discussion); + $state = $discussion->state; + $attributes += [ 'commentsCount' => (int) $discussion->comments_count, 'startTime' => $discussion->start_time->toRFC3339String(), 'lastTime' => $discussion->last_time ? $discussion->last_time->toRFC3339String() : null, 'lastPostNumber' => $discussion->last_post_number, 'canEdit' => $discussion->permission('edit'), - 'canDelete' => $discussion->permission('delete') - ]; + 'canDelete' => $discussion->permission('delete'), - if ($state = $discussion->state) { - $attributes += [ - 'readTime' => $state->read_time ? $state->read_time->toRFC3339String() : null, - 'readNumber' => (int) $state->read_number - ]; - } + 'readTime' => $state && $state->read_time ? $state->read_time->toRFC3339String() : null, + 'readNumber' => $state ? (int) $state->read_number : 0 + ]; return $this->attributesEvent($discussion, $attributes); }