Merge pull request #73 from kolorafa/master

When using column search field it wrongly uses OR in place of AND

Author: tigrang

Controller/Component/DataTableComponent.php

@@ -149,7 +149,7 @@ protected function _search(DataTableConfig $config, Model $Model) {
 				$columnSearchTerm = Hash::get($params, $searchKey);
 
 				if ($searchTerm && ($searchable === true || $searchable === DataTableConfig::SEARCH_GLOBAL)) {
-					$conditions[] = array("$column LIKE" => '%' . $searchTerm . '%');
+					$conditions['OR'][] = array("$column LIKE" => '%' . $searchTerm . '%');
 				}
 				if ($columnSearchTerm && ($searchable === true || $searchable === DataTableConfig::SEARCH_COLUMN)) {
 					$conditions[] = array("$column LIKE" => '%' . $columnSearchTerm . '%');
@@ -161,7 +161,7 @@ protected function _search(DataTableConfig $config, Model $Model) {
 			$i++;
 		}
 		if (!empty($conditions)) {
-			$config->conditions['OR'] = Hash::merge((array) Hash::get($config->conditions, 'OR'), $conditions);
+			$config->conditions['AND'] = Hash::merge((array) Hash::get($config->conditions, 'AND'), $conditions);
 		}
 	}