From dc27fa0d9b95c4438b5a7580179e3f18ad32b02d Mon Sep 17 00:00:00 2001 From: tofulm Date: Mon, 25 May 2020 17:32:28 +0200 Subject: [PATCH] =?UTF-8?q?On=20veut=20pouvoir=20utiliser=20les=20deux=20f?= =?UTF-8?q?onctions=20de=20surcharge=201.=20la=20general=202.=20la=20sp?= =?UTF-8?q?=C3=A9=20du=20slug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- formulaires/gamumail.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php index 5755a61..2d76e82 100644 --- a/formulaires/gamumail.php +++ b/formulaires/gamumail.php @@ -66,7 +66,8 @@ function formulaires_gamumail_charger_dist($slug, $auteur = 0, $Tclient = [], $T if ($f = charger_fonction('charger', 'gamumail', true)) { $valeurs = $f($valeurs, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); - } else if ($f = charger_fonction($slug . '_charger', 'gamumail', true)) { + } + if ($f = charger_fonction($slug . '_charger', 'gamumail', true)) { $valeurs = $f($valeurs, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); } @@ -83,7 +84,8 @@ function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $Tclient = [], $ if ($f = charger_fonction('verifier', 'gamumail', true)) { $erreurs = $f($erreurs, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); - } else if ($f = charger_fonction($slug . '_verifier', 'gamumail', true)) { + } + if ($f = charger_fonction($slug . '_verifier', 'gamumail', true)) { $erreurs = $f($erreurs, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); } @@ -168,7 +170,7 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T if(find_in_path('gamumail/html_header.html')){ $html_header = recuperer_fond('gamumail/html_header', $options); - }elseif (find_in_path($slug . '_html_header.html')) { + } elseif (find_in_path($slug . '_html_header.html')) { $html_header = recuperer_fond('gamumail/'.$slug . '_html_header', $options); } @@ -191,7 +193,8 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T if ($f = charger_fonction('traiter', 'gamumail', true)) { $corps = $f($corps, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); - } elseif ($f = charger_fonction($slug . '_traiter', 'gamumail', true)) { + } + if ($f = charger_fonction($slug . '_traiter', 'gamumail', true)) { $corps = $f($corps, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect); }