From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Oct 2019 04:57:29 +0000 (+0200)
Subject: [REF] don't handle non-array, pass by reference
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d81916a2c1e4ad513e01ba36d8af5bbc2a3b0529;p=civicrm-core.git

[REF] don't handle non-array, pass by reference

This is only called from one place & it is definitely coming in as an array & using the return values.
---

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index 0fcb3e7364..a3f46e68de 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -386,10 +386,7 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
    *
    * @return array
    */
-  public function normalizeDefaultValues(&$defaults) {
-    if (!is_array($defaults)) {
-      $defaults = array();
-    }
+  public function normalizeDefaultValues($defaults) {
     $this->loadDefaultCountryBasedOnState($defaults);
     if ($this->_ssID && empty($_POST)) {
       $defaults = array_merge($defaults, CRM_Contact_BAO_SavedSearch::getFormValues($this->_ssID));