From: Mattias Michaux <mattias.michaux@gmail.com>
Date: Fri, 30 Oct 2015 14:48:05 +0000 (+0100)
Subject: Don't prefix custom fields with entity table.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1a3e22cc7de1807909cd28a0dd965014004f2bb9;p=civicrm-core.git

Don't prefix custom fields with entity table.
---

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 23288b38d6..756a633c5f 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1672,7 +1672,8 @@ class CRM_Contact_BAO_Query {
 
     if ($apiEntity &&
       (substr($id, 0, strlen($apiEntity)) != $apiEntity) &&
-      (substr($id, 0, 10) != 'financial_' && substr($id, 0, 8) != 'payment_')
+      (substr($id, 0, 10) != 'financial_' && substr($id, 0, 8) != 'payment_') &&
+      (substr($id, 0, 7) != 'custom_')
     ) {
       $id = $apiEntity . '_' . $id;
     }