From: jitendrapurohit Date: Tue, 30 Aug 2016 09:57:34 +0000 (+0530) Subject: CRM-19275 - DB Error on adding priceset when deferred revenue setting is enabled X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fef6148e1d4ed6b881620dd6b3ea6b30afc308b2;p=civicrm-core.git 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 bc7994cd83..1c1805efa0 100644 --- 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('', $extends); if (!(in_array(CRM_Core_Component::getComponentID('CiviEvent'), $extends)