Don't prefix custom fields with entity table.

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 23288b38d6407715576ecaccbbffe539c19a3045..756a633c5fc0e808fd52826d94c83206cc718a5f 100644 (file)
--- 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;
     }