Handle null instead of required strings

null case on date filtering
null calling mb_substr

diff --git a/galette/lib/Galette/Filters/ContributionsList.php b/galette/lib/Galette/Filters/ContributionsList.php
index caee01961aa9742948da22eebb10e222e290d516..5bfa9d1e74eb342f4327891ee5bb435e1f048d0b 100644 (file)
--- a/galette/lib/Galette/Filters/ContributionsList.php
+++ b/galette/lib/Galette/Filters/ContributionsList.php
@@ -168,6 +168,9 @@ class ContributionsList extends Pagination
                 switch ($name) {
                     case 'start_date_filter':
                     case 'end_date_filter':
+                        if ($this->$name === null) {
+                            return $this->$name;
+                        }
                         try {
                             $d = \DateTime::createFromFormat(__("Y-m-d"), $this->$name);
                             if ($d === false) {

diff --git a/galette/lib/Galette/Util/Password.php b/galette/lib/Galette/Util/Password.php
index 20f62e31f997ab61de82633598bdad09fdd85429..16e95cfa63e196dd8ff6f1d3b40973b2ac3c79c4 100644 (file)
--- a/galette/lib/Galette/Util/Password.php
+++ b/galette/lib/Galette/Util/Password.php
@@ -272,6 +272,9 @@ class Password
 
         //some possible combinations
         foreach ([$adh->surname, $adh->nickname, $adh->login] as $surname) {
+            if ($surname === null) {
+                continue;
+            }
             $infos[] = mb_substr($surname, 0, 1) . $adh->name;
             $infos[] = $adh->name . mb_substr($surname, 0, 1);
             $infos[] = $surname . $adh->name;