Resolved merge conflict on CustomQuery file

diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php
index 108e675eeee34bfc9589a0819c9b06c72d252c9e..37b00ab57c85fb0d88f882253b63b2af5ce60901 100644 (file)
--- 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);