From dd83d2e9978799d98f281accc31c2e83ff7b3bdb Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 30 Sep 2021 12:40:47 +0200
Subject: [PATCH] Fix searhc on dynamic fields; closes #1575

---
 .../Galette/Filters/AdvancedMembersList.php   |  2 +-
 galette/lib/Galette/Repository/Members.php    | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/galette/lib/Galette/Filters/AdvancedMembersList.php b/galette/lib/Galette/Filters/AdvancedMembersList.php
index 4c7c7cfd7..5815bda94 100644
--- a/galette/lib/Galette/Filters/AdvancedMembersList.php
+++ b/galette/lib/Galette/Filters/AdvancedMembersList.php
@@ -300,7 +300,7 @@ class AdvancedMembersList extends MembersList
     /**
      * Global getter method
      *
-     * @param string $name name of the property we want to retrive
+     * @param string $name name of the property we want to retrieve
      *
      * @return object the called property
      */
diff --git a/galette/lib/Galette/Repository/Members.php b/galette/lib/Galette/Repository/Members.php
index b73382224..dae478749 100644
--- a/galette/lib/Galette/Repository/Members.php
+++ b/galette/lib/Galette/Repository/Members.php
@@ -666,19 +666,18 @@ class Members
             //check if there are dynamic fields in filter
             $hasDf = false;
             $dfs = array();
-
-            if (
-                $this->filters instanceof AdvancedMembersList
-                && isset($this->filters->free_search)
-                && count($this->filters->free_search) > 0
-                && !isset($this->filters->free_search['empty'])
-            ) {
-                $free_searches = $this->filters->free_search;
-                foreach ($free_searches as $fs) {
-                    if (strpos($fs['field'], 'dyn_') === 0) {
-                        // simple dynamic fields
-                        $hasDf = true;
-                        $dfs[] = str_replace('dyn_', '', $fs['field']);
+            if ($this->filters instanceof AdvancedMembersList) {
+                if (
+                    (bool)count($this->filters->free_search)
+                    && !isset($this->filters->free_search['empty'])
+                ) {
+                    $free_searches = $this->filters->free_search;
+                    foreach ($free_searches as $fs) {
+                        if (strpos($fs['field'], 'dyn_') === 0) {
+                            // simple dynamic fields
+                            $hasDf = true;
+                            $dfs[] = str_replace('dyn_', '', $fs['field']);
+                        }
                     }
                 }
             }
-- 
2.39.2