From 75cda5266a5e0c7c886b22f0394e68a76b1bbe2e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 16 Dec 2015 14:31:34 -0500
Subject: [PATCH] CRM-17646 - Fix array merge

---
 CRM/Core/BAO/CustomQuery.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php
index b65b1ce527..24d7f0491b 100644
--- a/CRM/Core/BAO/CustomQuery.php
+++ b/CRM/Core/BAO/CustomQuery.php
@@ -205,7 +205,12 @@ SELECT f.id, f.label, f.data_type,
           'data_type' => $dao->data_type,
           'html_type' => $dao->html_type,
         ),
-      ) + CRM_Core_PseudoConstant::get('CRM_Core_BAO_CustomField', 'custom_' . $dao->id, array(), 'search');
+      );
+
+      $options = CRM_Core_PseudoConstant::get('CRM_Core_BAO_CustomField', 'custom_' . $dao->id, array(), 'search');
+      if ($options) {
+        $this->_options[$dao->id] += $options;
+      }
 
       if ($dao->html_type == 'Select Date') {
         $this->_options[$dao->id]['attributes']['date_format'] = $dao->date_format;
-- 
2.25.1