From 3a96b63b5a44d672df863ce6cd10f19e10da686a Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Fri, 20 Jun 2014 16:37:34 +0530 Subject: [PATCH] -- CRM-14645, fixed notice error ---------------------------------------- * CRM-14645: Contribution is accepted even if Membership is not renewed. https://issues.civicrm.org/jira/browse/CRM-14645 --- CRM/Contribute/Form/Contribution/Main.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index fa99274e39..6dd1995c23 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -819,13 +819,15 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu foreach ($self->_values['fee'] as $fieldKey => $fieldValue) { if ($fieldValue['html_type'] != 'Text' && CRM_Utils_Array::value('price_' . $fieldKey, $fields)) { if (!is_array($fields['price_' . $fieldKey])) { - if (in_array($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id'], $currentMemberships)) { - $errors['price_' . $fieldKey] = ts($errorText, array( 1 => CRM_Member_PseudoConstant::membershipType($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id']))); + if (array_key_exists('membership_type_id', $fieldValue['options'][$fields['price_' . $fieldKey]]) + && in_array($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id'], $currentMemberships)) { + $errors['price_' . $fieldKey] = ts($errorText, array(1 => CRM_Member_PseudoConstant::membershipType($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id']))); } } else { foreach ($fields['price_' . $fieldKey] as $key => $ignore) { - if (in_array($fieldValue['options'][$key]['membership_type_id'], $currentMemberships)) { + if (array_key_exists('membership_type_id', $fieldValue['options'][$key]) + && in_array($fieldValue['options'][$key]['membership_type_id'], $currentMemberships)) { $errors['price_' . $fieldKey] = ts($errorText, array(1 => CRM_Member_PseudoConstant::membershipType($fieldValue['options'][$key]['membership_type_id']))); } } -- 2.25.1