Fix multiple relationships and remove duplicates

xiaohutai · Sep 6, 2017 · d87382f · d87382f
1 parent bf6e0f8
commit d87382f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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);
     }