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

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Serializer/PostSerializer.php
View File

@@ -85,7 +85,7 @@ class PostSerializer extends BasicPostSerializer
*/
protected function discussion($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionBasicSerializer');
}
/**
@@ -93,7 +93,7 @@ class PostSerializer extends BasicPostSerializer
*/
protected function editUser($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
/**
@@ -101,6 +101,6 @@ class PostSerializer extends BasicPostSerializer
*/
protected function hideUser($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
}