From d87382f619f97667afae696ed4ef8896338dc055 Mon Sep 17 00:00:00 2001 From: Xiao Hu Tai Date: Wed, 6 Sep 2017 10:54:31 +0200 Subject: [PATCH] Fix multiple relationships and remove duplicates --- src/Action/FetchAction.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Action/FetchAction.php b/src/Action/FetchAction.php index 1f778ee..4c737b2 100644 --- a/src/Action/FetchAction.php +++ b/src/Action/FetchAction.php @@ -71,20 +71,20 @@ protected function fetchIncludes($includes, $results, $parameters) if (is_array($results)) { foreach ($results as $key => $item) { //Loop through all relationships - foreach ($item->relation[$include] as $related) { - $included[$key] = $this->storeRelatedContent($parameters, $include, $related); + foreach ($item->getRelation($include) as $related) { + $included[] = $this->storeRelatedContent($parameters, $include, $related); } } //Must be a single content type } elseif ($results instanceof Content) { //Loop through all relationships - foreach ($results->getRelation($include) as $key => $related) { - $included[$key] = $this->storeRelatedContent($parameters, $include, $related); + foreach ($results->getRelation($include) as $related) { + $included[] = $this->storeRelatedContent($parameters, $include, $related); } } - } + $included = array_unique($included, SORT_REGULAR); return array_values($included); }