fix the member e-mail on resign and validation.

Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working. [see: #9640]
Dolibarr · Oct 19, 2018 · 402bbbe · 402bbbe
1 parent 33cd0e8
commit 402bbbe
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
@@ -634,6 +634,12 @@
 					$msg     = $arraydefaultmessage->content;
 				}
 
+                if (empty($labeltouse)) {
+                    //fallback on the old configuration.
+                    $subject = $conf->global->ADHERENT_MAIL_VALID_SUBJECT;
+                    $msg = $conf->global->ADHERENT_MAIL_VALID;
+                }
+
 				$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				complete_substitutions_array($substitutionarray, $outputlangs, $object);
 				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -707,6 +713,12 @@
 						$msg     = $arraydefaultmessage->content;
 					}
 
+                    if (empty($labeltouse)) {
+                        //fallback on the old configuration.
+                        $subject = $conf->global->ADHERENT_MAIL_RESIL_SUBJECT;
+                        $msg = $conf->global->ADHERENT_MAIL_RESIL;
+                    }
+
 					$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);