Priceset/debugwatchdog

diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
index c208546c8c7a375eeed6ff1a65f47184e14134c0..0b9f43dea94ebdfb92f1f9d6996364934e08484f 100644 (file)
--- a/CRM/Contribute/Form/ContributionBase.php
+++ b/CRM/Contribute/Form/ContributionBase.php
@@ -1399,7 +1399,11 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
       $this->_params['is_recur'] = $this->_values['is_recur'] = 1;
       // check if price set is not quick config
       if (!empty($this->_params['priceSetId']) && !CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_params['priceSetId'], 'is_quick_config')) {
-        list($this->_params['frequency_interval'], $this->_params['frequency_unit']) = CRM_Price_BAO_PriceSet::getRecurDetails($this->_params['priceSetId']);
+        // based on Lisa's commit 520680c63f7b886643e80c2400d9e9b6f1a1fd52
+        // Extract the ids for all of the line items that have been
+        // chosen.
+        $priceFieldValueIds = array_keys($this->_lineItem[$this->_params['priceSetId']]);
+        list($this->_params['frequency_interval'], $this->_params['frequency_unit']) = CRM_Price_BAO_PriceSet::getRecurDetails($this->_params['priceSetId'], $priceFieldValueIds);
       }
       else {
         // FIXME: set interval and unit based on selected membership type