Fixed known issue.

mindfiredigital · Apr 8, 2016 · cddd83c · cddd83c
1 parent bf498f3
commit cddd83c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Database/Query/Builder.php b/src/Database/Query/Builder.php
@@ -364,16 +364,16 @@ protected function getFMFieldValues($fmRecord = array(), $columns = '')
             return $eloquentRecord;
         }
 
-        // Assign all fields
-        if (in_array('*', $columns)) {
-            $columns = $this->fmFields;
-        }
-
         // Assign indivisual fields
         if (is_string($columns)) {
             $columns = [$columns];
         }
 
+        // Assign all fields
+        if (in_array('*', $columns)) {
+            $columns = $this->fmFields;
+        }
+
         // Get field-value pairs
         foreach ($columns as $column) {
             $eloquentRecord[$column] = $this->getIndivisualFieldValues($fmRecord, $column, $this->fmFields);