X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FPrice%2FBAO%2FPriceSet.php;h=d03b8b2c7b5ad60dffb2d1afe149ab06a9d4fd32;hb=acb1052ec2199198d0ca02bda45e61cc95ec6d35;hp=18b0c2918af48d4a39726be192070808a5cb9760;hpb=29d98e1314e345f1b9044f5359c2d0a67f380d21;p=civicrm-core.git diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index 18b0c2918a..d03b8b2c7b 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.php @@ -279,7 +279,7 @@ WHERE ct.id = cp.financial_type_id AND * @param int $id * Price Set id. * - * @return boolean + * @return bool * false if fields exist for this set, true if the * set could be deleted * @@ -903,7 +903,7 @@ WHERE id = %1"; $className = CRM_Utils_System::getClassName($form); if (in_array($className, array( 'CRM_Contribute_Form_Contribution', - 'CRM_Member_Form_Membership' + 'CRM_Member_Form_Membership', ))) { $validFieldsOnly = FALSE; } @@ -1310,7 +1310,7 @@ GROUP BY mt.member_of_contact_id"; * * @param int $id * Id of the database record. - * @param bool $isQuickConfigValue we want to set the is_quick_config field. + * @param bool $isQuickConfig we want to set the is_quick_config field. * Value we want to set the is_quick_config field. * * @return Object @@ -1326,9 +1326,8 @@ GROUP BY mt.member_of_contact_id"; * */ public static function checkMembershipPriceSet($id) { - $query = - " -SELECT pfv.id, pfv.price_field_id, pfv.name, pfv.membership_type_id, pf.html_type, mt.auto_renew + $query + = "SELECT pfv.id, pfv.price_field_id, pfv.name, pfv.membership_type_id, pf.html_type, mt.auto_renew FROM civicrm_price_field_value pfv LEFT JOIN civicrm_price_field pf ON pf.id = pfv.price_field_id LEFT JOIN civicrm_price_set ps ON ps.id = pf.price_set_id