merged conflict

cnizzardini · Jun 26, 2014 · c0aa136 · c0aa136
2 parents 997dae3 + a73f5c3
commit c0aa136
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Controller/Component/DataTableComponent.php b/Controller/Component/DataTableComponent.php
@@ -231,7 +231,7 @@ private function getWhereConditions(){
         foreach($fields as $x => $column){
 
             // only create conditions on bSearchable fields
-            if( $this->controller->request->query['bSearchable_'.$x] == 'true' ){
+             if (isset($this->controller->request->query['bSearchable_'.$x])) { // check if the parameter exists in query.
 
                 if($this->mDataProp == true){
                     $conditions['OR'][] = array(
@@ -268,7 +268,7 @@ private function getWhereConditions(){
                         }
                     }
                 }
-            }
+            } 
         }
         return $conditions;
     }
@@ -396,4 +396,4 @@ public function getTimes(){
 
         return $times;
     }
-}
+}