protected function _mergeConditions($query, $assoc)
{
if (empty($assoc)) {
return $query;
}
if (is_array($query)) {
return array_merge((array) $assoc, $query);
}
if (!empty($query)) {
$query = array($query);
if (is_array($assoc)) {
$query = array_merge($query, $assoc);
} else {
$query[] = $assoc;
}
return $query;
}
return $assoc;
}