diff --git a/formulaires/editer_block.html b/formulaires/editer_block.html index c93c6d1d75cf1559e196e9286013ffe7ebcf9ea1..ea591050904abd79f4e88da1f9d7ef7a63674852 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 9b5f5a36e0939584b68f82dbf5322ea24846ae36..a8af871f30b4fd6d16002945629f9a80f4530626 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; }