@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $temp = array( |
98 | 98 | 'columns' => array(), |
99 | 99 | ); |
100 | - array_map(function () use ($filters, &$temp) { |
|
100 | + array_map(function() use ($filters, &$temp) { |
|
101 | 101 | $temp['columns'][] = array( |
102 | 102 | 'search' => array( |
103 | 103 | 'value' => $filters['search'][Column::GLOBAL_ALIAS], |
@@ -129,8 +129,7 @@ discard block |
||
129 | 129 | $temp = '('.$this->columns[$index]->where($this->final_query, $filter['search']['value']).')'; |
130 | 130 | |
131 | 131 | $this->columns[$index]->isHaving() ? |
132 | - $having .= (!empty($having) ? ' AND ' : '').$temp : |
|
133 | - $where .= (!empty($where) ? ' '.($this->globalSearch ? 'OR' : 'AND').' ' : '').$temp; |
|
132 | + $having .= (!empty($having) ? ' AND ' : '').$temp : $where .= (!empty($where) ? ' '.($this->globalSearch ? 'OR' : 'AND').' ' : '').$temp; |
|
134 | 133 | } |
135 | 134 | } |
136 | 135 | |
@@ -210,8 +209,7 @@ discard block |
||
210 | 209 | ->getScalarResult(); |
211 | 210 | |
212 | 211 | return !empty($result) ? |
213 | - (int) $result[0]['count'] : |
|
214 | - 0; |
|
212 | + (int) $result[0]['count'] : 0; |
|
215 | 213 | } |
216 | 214 | |
217 | 215 | /** |
@@ -237,8 +235,7 @@ discard block |
||
237 | 235 | } |
238 | 236 | |
239 | 237 | $conditions = isset($filters['columns']) ? |
240 | - $this->createCondition($filters) : |
|
241 | - array(); |
|
238 | + $this->createCondition($filters) : array(); |
|
242 | 239 | |
243 | 240 | if (isset($conditions['where']) && !empty($conditions['where'])) { |
244 | 241 | $this->final_query->andWhere($conditions['where']); |