CRM-19624: Exclude / Include by privacy radio buttons gets reset on Smartgroup re...

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index ffcb35ab79f0d7dd047806025b6ae80a2fd914d0..c582e79f7b25ded9e980e8eb0b365b509d8d151b 100644 (file)
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -194,16 +194,16 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
    *   the default array reference
    */
   public function setDefaultValues() {
-    $defaults = $this->_formValues;
+    $defaults = array_merge($this->_formValues, array(
+      'privacy_toggle' => 1,
+      'operator' => TRUE,
+    ));
     $this->normalizeDefaultValues($defaults);
 
     if ($this->_context === 'amtg') {
       $defaults['task'] = CRM_Contact_Task::GROUP_CONTACTS;
     }
 
-    $defaults['privacy_toggle'] = 1;
-    $defaults['operator'] = 'AND';
-
     return $defaults;
   }