No null to trim()

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index 624c01fe9cbd337d6832422cca1b5d9dfe275a93..afaec078d663f623775e03e5b2f8bdffceb51a1f 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -944,7 +944,7 @@ class Adherent
     {
         $label = $this->fields[$field]['label'];
         //remove trailing ':' and then nbsp (for french at least)
-        $label = trim(trim($label, ':'), ' ');
+        $label = trim(trim($label ?? '', ':'), ' ');
         return $label;
     }
 
@@ -1074,7 +1074,7 @@ class Adherent
             if (isset($values[$key])) {
                 $value = $values[$key];
                 if ($value !== true && $value !== false) {
-                    $value = trim($value);
+                    $value = trim($value ?? '');
                 }
             } elseif (empty($this->_id)) {
                 switch ($key) {