CRM-19275 - DB Error on adding priceset when deferred revenue setting is enabled

diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php
index bc7994cd833b0360b2f722bb8eca4510bc4f4dce..1c1805efa0056cb292027609bd58bc4f3944593f 100644 (file)
--- a/CRM/Financial/BAO/FinancialAccount.php
+++ b/CRM/Financial/BAO/FinancialAccount.php
@@ -443,18 +443,16 @@ LIMIT 1";
       return FALSE;
     }
     if ($entityID) {
-      $query = ' SELECT ps.extends FROM civicrm_price_set ps %3 WHERE %1.id = %2';
+      $query = ' SELECT ps.extends FROM civicrm_price_set ps';
       $params = array(
         1 => array('ps', 'Text'),
         2 => array($entityID, 'Integer'),
       );
       if ($entity == 'PriceField') {
         $params[1] = array('pf', 'Text');
-        $params[3] = array(
-          ' INNER JOIN civicrm_price_field pf ON pf.price_set_id = ps.id ',
-          'Text',
-        );
+        $query .= ' INNER JOIN civicrm_price_field pf ON pf.price_set_id = ps.id ';
       }
+      $query .= ' WHERE %1.id = %2';
       $extends = CRM_Core_DAO::singleValueQuery($query, $params);
       $extends = explode('\ 1', $extends);
       if (!(in_array(CRM_Core_Component::getComponentID('CiviEvent'), $extends)