Merge pull request #15650 from demeritcowboy/mode-value-missing

dev/core#1347 - Fix php warning in advanced search when opening some accordions
civicrm · Oct 30, 2019 · 18efe70 · 18efe70
2 parents 9427137 + 48016b1
commit 18efe70
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php
@@ -302,7 +302,8 @@ public static function getModeValue($mode = CRM_Contact_BAO_Query::MODE_CONTACTS
     }
 
     self::setModeValues();
-    if (!array_key_exists($mode, self::$_modeValues)) {
+    // Note $mode might === FALSE because array_search above failed, e.g. for searchPane='location'
+    if (empty(self::$_modeValues[$mode])) {
       $mode = CRM_Contact_BAO_Query::MODE_CONTACTS;
     }