@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $temp = array( |
92 | 92 | 'columns' => array(), |
93 | 93 | ); |
94 | - array_map(function () use ($filters, &$temp) { |
|
94 | + array_map(function() use ($filters, &$temp) { |
|
95 | 95 | $temp['columns'][] = array( |
96 | 96 | 'search' => array( |
97 | 97 | 'value' => $filters['search'][Column::GLOBAL_ALIAS], |
@@ -150,8 +150,7 @@ discard block |
||
150 | 150 | $temp = $this->createWherePart($query, $filters); |
151 | 151 | |
152 | 152 | return !empty($temp) ? |
153 | - $query->andWhere($temp) : |
|
154 | - $query; |
|
153 | + $query->andWhere($temp) : $query; |
|
155 | 154 | } |
156 | 155 | |
157 | 156 | /** |
@@ -296,11 +295,9 @@ discard block |
||
296 | 295 | )->result( |
297 | 296 | $query, |
298 | 297 | isset($filters['order']) && isset($filters['order'][0]) ? |
299 | - $filters['order'][0]['column'] : |
|
300 | - 0, |
|
298 | + $filters['order'][0]['column'] : 0, |
|
301 | 299 | isset($filters['order']) && isset($filters['order'][0]) ? |
302 | - $filters['order'][0]['dir'] : |
|
303 | - 'ASC' |
|
300 | + $filters['order'][0]['dir'] : 'ASC' |
|
304 | 301 | ); |
305 | 302 | |
306 | 303 | $ret = array( |