From ad7920a6d78d4c203346cd845d25d82632ddc156 Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 16 Feb 2016 15:13:16 +0000
Subject: [PATCH] CRM-18019-4.6: Better solution for fixing array

---
 CRM/Core/BAO/CustomField.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index a814410926..b2eaed029a 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -1224,17 +1224,9 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
       case 'Multi-Select':
         if (is_array($value)) {
           if ($html_type == 'CheckBox') {
-            $newData = array();
-            foreach ($checkedData as $k => $v) {
-              if (!empty($v)) {
-                $newData[] = $k;
-              }
-            }
-            $checkedData = $newData;
-          }
-          else {
-            $checkedData = $value;
+            CRM_Utils_Array::formatArrayKeys($value);
           }
+          $checkedData = $value;
         }
         else {
           $checkedData = explode(CRM_Core_DAO::VALUE_SEPARATOR,
@@ -1249,6 +1241,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
             $checkedData = $newData;
           }
         }
+
         $v = array();
         foreach ($checkedData as $key => $val) {
           $v[] = CRM_Utils_Array::value($val, $option);
-- 
2.25.1