From 607a937647f001461d22b8ed3f1bac4372610630 Mon Sep 17 00:00:00 2001 From: monishdeb Date: Sun, 9 Aug 2015 16:05:44 +0530 Subject: [PATCH] Resolved merge conflict on CustomQuery file --- CRM/Core/BAO/CustomQuery.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php index 108e675eee..37b00ab57c 100644 --- a/CRM/Core/BAO/CustomQuery.php +++ b/CRM/Core/BAO/CustomQuery.php @@ -413,16 +413,6 @@ SELECT label, value if (!is_array($value)) { $value = CRM_Utils_Type::escape($strtolower($value), 'String'); } - // in api sometimes params is in array('sqlOp' => (mixed)'values') format - elseif (!empty($value) && in_array(key($value), CRM_Core_DAO::acceptedSQLOperators(), TRUE) || strstr(key($value), 'EMPTY')) { - $op = key($value); - $qillOp = CRM_Utils_Array::value($op, CRM_Core_SelectValues::getSearchBuilderOperators(), $op); - $value = CRM_Utils_Type::escape($strtolower($value[$op]), 'String'); - } - - if (strstr($op, 'NULL') || strstr($op, 'EMPTY')) { - $qillValue = $value = NULL; - } elseif ($isSerialized) { if (in_array(key($value), CRM_Core_DAO::acceptedSQLOperators(), TRUE)) { $op = key($value); -- 2.25.1