Issue fix #1191 (#1192)

directus · Aug 12, 2019 · d76604a · d76604a
1 parent 92b32ed
commit d76604a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/core/Directus/Database/TableGateway/RelationalTableGateway.php b/src/core/Directus/Database/TableGateway/RelationalTableGateway.php
@@ -2049,7 +2049,9 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
             // Only select the fields not on the currently authenticated user group's read field blacklist
             $relationalColumnName = $alias->getRelationship()->getFieldMany();
             $tableGateway = new RelationalTableGateway($relatedTableName, $this->adapter, $this->acl);
-            $filterFields = \Directus\get_array_flat_columns($columnsTree[$alias->getName()]);
+            if(!empty($columnsTree[$alias->getName()])){
+                $filterFields = \Directus\get_array_flat_columns($columnsTree[$alias->getName()]);
+            }
             $filters = [];
 
             if (ArrayUtils::get($params, 'lang') && DataTypes::isTranslationsType($alias->getType())) {
@@ -2067,7 +2069,7 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
             }
 
             $results = $tableGateway->fetchItems(array_merge([
-                'fields' => array_merge([$relationalColumnName], $filterFields),
+                'fields' => !empty($filterFields)  ? array_merge([$relationalColumnName], $filterFields) : [$relationalColumnName],
                 // Fetch all related data
                 'limit' => -1,
                 'filter' => array_merge($filters, [
@@ -2076,7 +2078,9 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
             ], $params));
 
             $relatedEntries = [];
-            $selectedFields = $tableGateway->getSelectedFields($filterFields);
+            if(!empty($filterFields)){
+                $selectedFields = $tableGateway->getSelectedFields($filterFields);
+            }
 
             foreach ($results as $row) {
                 // Quick fix