Merge branch 'hotfix/v5.8.6'

Author: yajra

change-log.md

@@ -8,6 +8,10 @@
 
 ##Change Log
 
+###v5.8.6
+    - Fix DT_Row options when returning a flatten array response.
+    - Fix PR #126.
+    
 ###v5.8.5
     - Revert try-catch when compiling blade.
     - Fix html builder unit test.

src/yajra/Datatables/Processors/DataProcessor.php

@@ -2,7 +2,6 @@
 
 namespace yajra\Datatables\Processors;
 
-use Illuminate\Support\Arr;
 use yajra\Datatables\Helper;
 
 /**
@@ -73,12 +72,9 @@ public function process($object = false)
             $value = $this->addColumns($data, $row);
             $value = $this->editColumns($value, $row);
             $value = $this->setupRowVariables($value, $row);
-            if ( ! $object) {
-                $value = Arr::flatten($this->removeExcessColumns($value));
-            } else {
-                $value = $this->removeExcessColumns($value);
-            }
-            $this->output[] = $value;
+            $value = $this->removeExcessColumns($value);
+
+            $this->output[] = $object ? $value : $this->flatten($value);
         }
 
         return $this->output;
@@ -152,4 +148,25 @@ protected function removeExcessColumns(array $data)
         return $data;
     }
 
+    /**
+     * Flatten array with exceptions.
+     *
+     * @param array $array
+     * @return array
+     */
+    public function flatten(array $array)
+    {
+        $return     = [];
+        $exceptions = ['DT_RowId', 'DT_RowClass', 'DT_RowData', 'DT_RowAttr'];
+
+        foreach ($array as $key => $value) {
+            if (in_array($key, $exceptions)) {
+                $return[$key] = $value;
+            } else {
+                $return[] = $value;
+            }
+        }
+
+        return $return;
+    }
 }