Fix searhc on dynamic fields; closes #1575

diff --git a/galette/lib/Galette/Filters/AdvancedMembersList.php b/galette/lib/Galette/Filters/AdvancedMembersList.php
index 4c7c7cfd79aaa1a5f7c275ba36d4dd27898a3651..5815bda943de65d049ca25a08881d6085003a06e 100644 (file)
--- 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 b7338222451aff57988cfcf2f98e9803952b8588..dae478749683afafb3294945aaef517441020aa5 100644 (file)
--- 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']);
+                        }
                     }
                 }
             }