fix issue converting table object to array

when a table object doesn't have any column it throw an error because columns doesn't not exists (it's not an array)
stickgrinder · Apr 1, 2018 · eaa4106 · eaa4106
1 parent 87bb231
commit eaa4106
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/api/core/Directus/Database/Object/Table.php b/api/core/Directus/Database/Object/Table.php
@@ -51,7 +51,7 @@ class Table implements \ArrayAccess, Arrayable, \JsonSerializable
     /**
      * @var Column[]
      */
-    protected $columns;
+    protected $columns = [];
 
     /**
      * Column that represents the table main value
@@ -1100,8 +1100,11 @@ public function toArray()
     {
         $array = $this->propertyArray();
         $columns = [];
-        foreach($array['columns'] as $column) {
-            $columns[] = $column->toArray();
+
+        if (isset($array['columns'])) {
+            foreach($array['columns'] as $column) {
+                $columns[] = $column->toArray();
+            }
         }
 
         $array['columns'] = $columns;