CRM - 17471 Fix Issue where updated status labels aren't displayed in search

[civicrm-core.git] / CRM / Member / BAO / Query.php

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 4f003fcf4c0ee9aeb8d8858ae314dfbda7ad0a1a..0fff4dc3cb54423534ed61f8d30e3c4843894173 100644 (file)
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -292,6 +292,9 @@ class CRM_Member_BAO_Query {
         return;
 
       case 'member_campaign_id':
+        if (CRM_Utils_Array::value($op, $value)) {
+          $value = $value[$op];
+        }
         $campParams = array(
           'op' => $op,
           'campaign' => $value,
@@ -393,7 +396,7 @@ class CRM_Member_BAO_Query {
    * @param CRM_Core_Form $form
    */
   public static function buildSearchForm(&$form) {
-    $membershipStatus = CRM_Member_PseudoConstant::membershipStatus();
+    $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label', FALSE, FALSE);
     $form->add('select', 'membership_status_id', ts('Membership Status(s)'), $membershipStatus, FALSE,
       array('id' => 'membership_status_id', 'multiple' => 'multiple', 'class' => 'crm-select2')
     );