From: Dave Greenberg <dave@civicrm.org>
Date: Sat, 17 May 2014 01:01:47 +0000 (-0700)
Subject: CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ref to get... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=764b1cdc585eaadb4cd9a92eaca91714e0689049;p=civicrm-core.git

CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ref to get the options.

----------------------------------------
* CRM-14700:
  https://issues.civicrm.org/jira/browse/CRM-14700
---

diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index 0e986392d1..dd40d1a107 100644
--- a/CRM/Member/Form/MembershipType.php
+++ b/CRM/Member/Form/MembershipType.php
@@ -181,9 +181,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form {
       array('' => ts('- select -')) + $relTypeInd);
     $memberRel->setMultiple(TRUE);
 
-    // The auto-magic metadata retrieval does not return the correct enum values. Reverting to old approach for now. dgg
-    // $this->addSelect('visibility', array('placeholder' => NULL, 'option_url' => NULL));
-    $this->add('select', 'visibility', ts('Visibility'), CRM_Core_SelectValues::memberVisibility(), TRUE, array('class' => 'crm-select2'));
+    $this->addSelect('visibility', array('placeholder' => NULL, 'option_url' => NULL));
 
     $this->add('text', 'weight', ts('Order'),
       CRM_Core_DAO::getAttribute('CRM_Member_DAO_MembershipType', 'weight')