From 2267460cf157ea2688978a6326773dcb97063985 Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Tue, 20 May 2014 17:21:34 -0700 Subject: [PATCH] Fix incomplete comment and add placeholder to duration_unit in Membership Type form. --- CRM/Mailing/Form/Settings.php | 2 +- CRM/Member/Form/MembershipType.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Mailing/Form/Settings.php b/CRM/Mailing/Form/Settings.php index 59825fb6c6..b62f8bd176 100644 --- a/CRM/Mailing/Form/Settings.php +++ b/CRM/Mailing/Form/Settings.php @@ -66,7 +66,7 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form { */ function setDefaultValues() { $mailingID = CRM_Utils_Request::retrieve('mid', 'Integer', $this, FALSE, NULL); - // CRM- + // CRM-14716 - Pick up mailingID from session since most of the time it's not in the URL if (!$mailingID) { $mailingID = $this->get('mailing_id'); } diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php index ed58b41f24..17e0b726e0 100644 --- a/CRM/Member/Form/MembershipType.php +++ b/CRM/Member/Form/MembershipType.php @@ -132,7 +132,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form { ); $this->addRule('minimum_fee', ts('Please enter a monetary value for the Minimum Fee.'), 'money'); - $this->addSelect('duration_unit', array('placeholder' => NULL), TRUE); + $this->addSelect('duration_unit', array(), TRUE); //period type $this->addSelect('period_type', array(), TRUE); -- 2.25.1