PHP 8.1 fixes

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index bfd5c4dafb15bb89bf0fcb574c49972fdbdf6e51..50216674b847d16123feeb4662faa55950789bc9 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -768,8 +768,6 @@ class Adherent
     {
         $ret = '';
         $date_now = new \DateTime();
-        $ddate = new \DateTime($this->_due_date);
-        $date_diff = $date_now->diff($ddate);
         if ($this->isDueFree()) {
             $ret = _T("Freed of dues");
         } elseif ($this->_due_date == '') {
@@ -789,12 +787,15 @@ class Adherent
                 $ret = _T("Never contributed");
             }
         } elseif ($this->_days_remaining == 0) {
+            $ddate = new \DateTime($this->_due_date);
+            $date_diff = $date_now->diff($ddate);
             if ($date_diff->invert == 0) {
                 $ret = _T("Last day!");
             } else {
                 $ret = _T("Late since today!");
             }
         } elseif ($this->_days_remaining < 0) {
+            $ddate = new \DateTime($this->_due_date);
             $patterns = array('/%days/', '/%date/');
             $replace = array(
                 $this->_days_remaining * -1,
@@ -810,6 +811,7 @@ class Adherent
                 $ret = _T("No longer member");
             }
         } else {
+            $ddate = new \DateTime($this->_due_date);
             $patterns = array('/%days/', '/%date/');
             $replace = array(
                 $this->_days_remaining,

diff --git a/galette/lib/Galette/Entity/PdfModel.php b/galette/lib/Galette/Entity/PdfModel.php
index a5e1de9039a95715c35beb6716b4b8f5fe4be88c..fb6d377759d6e183530024e037d54a26a6c034bb 100644 (file)
--- a/galette/lib/Galette/Entity/PdfModel.php
+++ b/galette/lib/Galette/Entity/PdfModel.php
@@ -208,12 +208,12 @@ abstract class PdfModel
     public function store()
     {
         $title = $this->title;
-        if (trim($title) === '') {
+        if ($title === null || trim($title) === '') {
             $title = new Expression('NULL');
         }
 
         $subtitle = $this->subtitle;
-        if (trim($subtitle) === '') {
+        if ($subtitle === null || trim($subtitle) === '') {
             $subtitle = new Expression('NULL');
         }
 

diff --git a/galette/templates/default/gestion_adherents.tpl b/galette/templates/default/gestion_adherents.tpl
index 80778d183e03b080e7abe913b45e7b01064eb615..efda7d30830baea1145247994013897b4b79d2bf 100644 (file)
--- a/galette/templates/default/gestion_adherents.tpl
+++ b/galette/templates/default/gestion_adherents.tpl
@@ -226,7 +226,12 @@ We have to use a template file, so Smarty will do its work (like replacing varia
         {else}
             {assign var="lrclass" value=$rclass}
             {assign var="propname" value=$column->propname}
-            {assign var=value value=$member->$propname|escape}
+            {assign var="propvalue" value=$member->$propname}
+            {if $propvalue}
+                {assign var=value value=$propvalue|escape}
+            {else}
+                {assign var=value value=$propvalue}
+            {/if}
 
             {if $column->field_id eq 'nom_adh'}
                 {assign var="value" value=$member->sfullname}