From 2f0a20bd9731a0aca01a24230a008dd3091d2778 Mon Sep 17 00:00:00 2001
From: nicod_ <nicod@lerebooteux.fr>
Date: Fri, 5 May 2023 16:40:39 +0200
Subject: [PATCH] =?UTF-8?q?Eviter=20d'empiler=20des=20&=20dans=20l'url?=
=?UTF-8?q?=20de=20retour=20=C3=A0=20chaque=20fois=20qu'on=20annule=20une?=
=?UTF-8?q?=20modif=20ou=20un=20ajout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
formulaires/editer_block.html | 2 +-
formulaires/editer_block.php | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/formulaires/editer_block.html b/formulaires/editer_block.html
index c93c6d1..ea59105 100644
--- a/formulaires/editer_block.html
+++ b/formulaires/editer_block.html
@@ -17,7 +17,7 @@
</div>
<p class="boutons">
- [(#ENV{include}|oui)<a href="#ENV{redirect}" class="submit btn btn_secondaire"><:bouton_annuler:/></a>]
+ [(#ENV{include}|oui)<button type="submit" name="annuler" class="submit btn btn_secondaire"><:bouton_annuler:/></button>]
[(#ENV{id_blocktype}|non)
<button type="submit" class="submit" name="choisir" value="1"><:block:bouton_choisir:/></button>
]
diff --git a/formulaires/editer_block.php b/formulaires/editer_block.php
index 9b5f5a3..a8af871 100644
--- a/formulaires/editer_block.php
+++ b/formulaires/editer_block.php
@@ -235,6 +235,10 @@ function formulaires_editer_block_traiter_dist($id_block = 'new', $objet = null,
}
}
+ if($retour){
+ $retours['redirect'] = $retour;
+ }
+ $retours['redirect'] = str_replace('&', '&', $retours['redirect']);
return $retours;
}
--
GitLab