- if(!empty($q['query']['name'])){
- $s = $this->escape($q['query']['name']);
- $this->whereAdd("
- {$tn}.name LIKE '%$s%'
- ");
- }
- if(!empty($q['search']['name'])){
- $s = $this->escape($q['search']['name']);
+ if(!empty($q['query']['name']) || !empty($q['search']['name'])){
+
+ $s = (!empty($q['query']['name'])) ? $this->escape($q['query']['name']) : $this->escape($q['search']['name']);
+