From bd231523717157ff59d0d778d6422f3cd05328b4 Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 15 Feb 2016 12:02:55 +0000
Subject: [PATCH] CRM-18019: Fix regression with views display of custom fields

---
 CRM/Core/BAO/CustomField.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

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