From: Eileen McNaughton Date: Wed, 13 May 2015 05:48:56 +0000 (+1200) Subject: minor variable tidy up X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=579e1e0efb8d4283665225f9e64328af6e1c5fd6;p=civicrm-core.git minor variable tidy up --- diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index bd4555f501..de53af41c7 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -270,9 +270,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { /** * Set default values for the form. MobileProvider that in edit/view mode * the default values are retrieved from the database - * - * - * @return void */ public function setDefaultValues() { if ($this->_cdType) { @@ -431,8 +428,8 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { } $this->assign('taxRates', json_encode(CRM_Core_PseudoConstant::getTaxRates())); - $config = CRM_Core_Config::singleton(); - $this->assign('currency', $config->defaultCurrencySymbol); + + $this->assign('currency', CRM_Core_Config::singleton()->defaultCurrencySymbol); $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings'); $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings); if (isset($invoicing)) { @@ -587,9 +584,9 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { $memTypeJs = array('onChange' => "CRM.buildCustomData( 'Membership', this.value );"); //build the form for auto renew. - $recurProcessor = $autoRenew = array(); + $autoRenew = array(); if ($this->_mode || ($this->_action & CRM_Core_Action::UPDATE)) { - $autoRenewElement = $this->addElement('checkbox', + $this->addElement('checkbox', 'auto_renew', ts('Membership renewed automatically'), NULL,