minor changes

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index 00e8ac514733e0a71656ab65a19654d047e9c811..607fabf8c8cb594a44a978ead7b28f7c5b9bcf12 100644 (file)
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -1038,9 +1038,8 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
 
           // CRM-14983: verify if values are comma separated convert to array
           if (!is_array($value) && (strpos($value, ',') !== FALSE || strstr($value, '(')) && substr($fldName, 0, 7) != 'custom_' && $params['operator'][$key][$k] == 'IN') {
-            preg_match('#\((.*?)\)#', $value, $match);
-            $tmpArray = explode(',', $match[1]);
-            $value = array_combine(array_values($tmpArray), array_values($tmpArray));
+            $value = explode(',', trim($value, "(..)"));
+            $value = array($params['operator'][$key][$k] => $value);
           }
 
           if ($row) {