From 5e2962ef38ebecdf7c74a85d3de130035356ffd5 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Thu, 29 Oct 2020 10:50:13 +0100
Subject: [PATCH 1/2] FIX - 10.0 - remove 'action' parameter from redirect URL
 when reordering lines on a document

---
 htdocs/core/tpl/ajaxrow.tpl.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 0b92df1e519..620d0433b27 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -80,7 +80,12 @@ $(document).ready(function(){
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');
-							location.href = '<?php echo dol_escape_js(empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove); ?>';
+							<?php
+							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
+							// remove action parameter from URL
+							$redirectURL = preg_replace('/[&?]action=[^&]*/', '', $redirectURL);
+							?>
+							location.href = '<?php echo dol_escape_js($redirectURL); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
@@ -108,4 +113,4 @@ $(document).ready(function(){
 });
 </script>
 <?php } ?>
-<!-- END PHP TEMPLATE AJAXROW.TPL.PHP -->
\ No newline at end of file
+<!-- END PHP TEMPLATE AJAXROW.TPL.PHP -->

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 2/2] 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 {