From: Eileen McNaughton Date: Sun, 12 Jul 2015 10:32:01 +0000 (+1200) Subject: phpcs fix & remove unused param X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b692465195ef6df09f4cff705c6ed7eb8b4a697a;p=civicrm-core.git phpcs fix & remove unused param --- diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 5ca038d83c..c8020476f8 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -2301,7 +2301,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND 'fields' => $fields, 'price_fields' => array( 'price_' . $fieldID => CRM_Utils_Array::value('id', $results), - ) + ), ); return $returnParams; } diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index ad4ab1bc56..2ddd44319d 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -482,14 +482,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { */ protected function submit() { $this->storeContactFields($this->_params); - // use values from screen - - if ($this->_params['membership_type_id'][1] <> 0) { - $defaults['receipt_text_renewal'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', - $this->_params['membership_type_id'][1], - 'receipt_text_renewal' - ); - } $now = CRM_Utils_Date::getToday(NULL, 'YmdHis'); $this->convertDateFieldsToMySQL($this->_params);