From 5439e6fb77f569bc918cbbe18e572c438cc83f08 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 27 Aug 2014 21:28:19 +0100 Subject: [PATCH] Code cleanup --- CRM/Core/BAO/CustomField.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index b80f086842..24a8782cef 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -411,11 +411,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { } } - if ($customDataSubType && !is_array($customDataSubType)) { - $customDataSubType = explode(CRM_Core_DAO::VALUE_SEPARATOR, - trim($customDataSubType, CRM_Core_DAO::VALUE_SEPARATOR) - ); - } + $customDataSubType = CRM_Utils_Array::explodePadded($customDataSubType); if (is_array($customDataType)) { $cacheKey = implode('_', $customDataType); @@ -684,8 +680,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { ); } } - return $all ? array( - NULL, NULL) : NULL; + return $all ? array(NULL, NULL) : NULL; } /** -- 2.25.1