Merge pull request #3617 from eileenmcnaughton/CRM-14946

[civicrm-core.git] / CRM / Member / Form / MembershipType.php

diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index 479ee08f415d1a1464fb9092e9a0f3029206440a..17e0b726e03650c3bc5b5c44dff8136357db3754 100644 (file)
--- 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);
@@ -182,6 +182,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
     $memberRel->setMultiple(TRUE);
 
     $this->addSelect('visibility', array('placeholder' => NULL, 'option_url' => NULL));
+
     $this->add('text', 'weight', ts('Order'),
       CRM_Core_DAO::getAttribute('CRM_Member_DAO_MembershipType', 'weight')
     );
@@ -411,6 +412,12 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
     }
   }
 
+  /**
+   * @param $previousID
+   * @param $priceSetId
+   * @param $membershipTypeId
+   * @param $optionsIds
+   */
   public static function checkPreviousPriceField($previousID, $priceSetId, $membershipTypeId, &$optionsIds) {
     if ($previousID) {
       $editedFieldParams = array(