From 4ac3496de30538dbed38e0fe587e62aa9cd3f7a1 Mon Sep 17 00:00:00 2001
From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Thu, 13 Aug 2015 12:06:16 +1200
Subject: [PATCH] CRM-16036 fix for tests

---
 api/v3/utils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/v3/utils.php b/api/v3/utils.php
index 30bdcac6e0..db19ad93b5 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -515,7 +515,7 @@ function _civicrm_api3_get_using_utils_sql($dao_name, $params, $isFillUniqueFiel
 
   // default fields
   foreach (array_keys($return) as $field_name) {
-    if (!empty($uniqueAliases[$field_name]) && substr($field_name, 0, 7) != 'custom_') {
+    if (!empty($uniqueAliases[$field_name]) && (CRM_Core_BAO_CustomField::getKeyID($field_name) == FALSE)) {
       // 'a.' is an alias for the entity table.
       $select_fields["a.{$uniqueAliases[$field_name]}"] = $uniqueAliases[$field_name];
     }
-- 
2.25.1