From b246343a2294db435300d366128faf99d530bf21 Mon Sep 17 00:00:00 2001 From: monishdeb Date: Sat, 20 Jun 2015 04:36:25 +0530 Subject: [PATCH] merge conflict fix --- CRM/Core/BAO/Mapping.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index 8ee8a48a59..833b3ebed9 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -1043,10 +1043,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)); + if (strstr($params['operator'][$key][$k], 'IN') && !is_array($value) && (strpos($value, ',') !== FALSE || strstr($value, '(') || !empty($value)) && substr($fldName, 0, 7) != 'custom_') { + $value = explode(',', str_replace(array('(', ')'), '', $value)); } if ($row) { -- 2.25.1