From 400acf9f65db95f758d7565d1e79809920eb3353 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Mon, 2 Nov 2020 08:26:36 +0100
Subject: [PATCH] FIX - 10.0 - regex to remove 'action' parameter: taking
 feedback from PR#15213 into account

---
 htdocs/core/tpl/ajaxrow.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 620d0433b27..3f8f565c467 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -83,7 +83,7 @@ $(document).ready(function(){
 							<?php
 							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
 							// remove action parameter from URL
-							$redirectURL = preg_replace('/[&?]action=[^&]*/', '', $redirectURL);
+							$redirectURL = preg_replace('/(&|\?)action=[^&#]*/', '', $redirectURL);
 							?>
 							location.href = '<?php echo dol_escape_js($redirectURL); ?>';
 						} else {