fix old many to many infinite loop

directus · Nov 28, 2016 · 6680188 · 6680188
1 parent 7452570
commit 6680188
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/api/core/Directus/Db/TableGateway/RelationalTableGateway.php b/api/core/Directus/Db/TableGateway/RelationalTableGateway.php
@@ -980,7 +980,11 @@ public function loadManyToOneRelationships($schemaArray, $table_entries, $parent
                     return $table_entries;
                 }
 
-                $this->addToManyCallStack($level, is_null($parentField) ? $foreign_id_column : $parentField, $foreign_table_name);
+                if (is_null($parentField)) {
+                    $parentField = $foreign_id_column;
+                }
+
+                $this->addToManyCallStack($level, $parentField, $foreign_table_name);
 
                 // Aggregate all foreign keys for this relationship (for each row, yield the specified foreign id)
                 $yield = function ($row) use ($foreign_id_column, $table_entries) {