mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-14 21:36: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

14
src/Api/Controller/ListDiscussionsController.php
View File

@ -93,6 +93,18 @@ class ListDiscussionsController extends AbstractListController
$results->areMoreResults() ? null : 0
);
return $results->getResults();
$results = $results->getResults();
if ($relations = array_intersect($load, ['startPost', 'lastPost'])) {
foreach ($results as $discussion) {
foreach ($relations as $relation) {
if ($discussion->$relation) {
$discussion->$relation->discussion = $discussion;
}
}
}
}
return $results;
}
}