hotfix: add x2m data when fetching multiple entries

directus · Nov 8, 2016 · b0a9000 · b0a9000
1 parent 78b17a2
commit b0a9000
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/api/core/Directus/Db/TableGateway/RelationalTableGateway.php b/api/core/Directus/Db/TableGateway/RelationalTableGateway.php
@@ -734,6 +734,16 @@ public function getEntries($params = [])
         $this->toManyCallStack = [];
         $results = $this->loadManyToOneRelationships($schemaArray, $results);
 
+        // =============================================================================
+        // HOTFIX: Fetching X2M data and Infinite circle loop
+        // =============================================================================
+        // Separate alias fields from table schema array
+        $aliasColumns = $this->filterSchemaAliasFields($schemaArray); // (fmrly $alias_schema)
+        foreach($results as $key => $result) {
+            $this->toManyCallStack = [];
+            $results[$key] = $this->loadToManyRelationships($result, $aliasColumns);
+        }
+
         /**
          * Fetching a set of data
          */
@@ -756,11 +766,6 @@ public function getEntries($params = [])
 
         list($result) = $results;
 
-        // Separate alias fields from table schema array
-        $alias_fields = $this->filterSchemaAliasFields($schemaArray); // (fmrly $alias_schema)
-
-        $result = $this->loadToManyRelationships($result, $alias_fields);
-
         return $result;
     }