diff --git a/module/datatable/control.php b/module/datatable/control.php index 0076f3fda2..ab2784e7b9 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -94,7 +94,7 @@ class datatable extends control } $name = 'datatable.' . $module . ucfirst($method) . '.cols'; - $value = json_encode(array_values($fieldList)); + $value = json_encode($fieldList); $this->loadModel('setting')->setItem($account . '.' . $name, $value); if($this->post->global) $this->setting->setItem('system.' . $name, $value); diff --git a/module/datatable/model.php b/module/datatable/model.php index 2f1d990cb5..bf21cf80a9 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -109,17 +109,7 @@ class datatableModel extends model } } - usort($setting, array('datatableModel', 'sortCols')); - - /* In index array, find actions. */ - $types = array_column($setting, 'type'); - $index = array_search('actions', $types); - - if($index) - { - $setting['actions'] = $setting[$index]; - unset($setting[$index]); - } + uasort($setting, array('datatableModel', 'sortCols')); return $setting; }