From 7ccc2b95561343acffcbb3c7ee30473b1d1ea66c Mon Sep 17 00:00:00 2001
From: janschoenherr <jan@yootheme.com>
Date: Tue, 7 Nov 2023 16:26:35 +0100
Subject: [PATCH 1/3] Fix `function` parameter lost during redirect

Currently if you are switching the menu filter in the menu item select modal, the function parameter will be lost on redirect.
---
 .../components/com_menus/src/Controller/DisplayController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/administrator/components/com_menus/src/Controller/DisplayController.php b/administrator/components/com_menus/src/Controller/DisplayController.php
index 5eba2c6ef97c5..344162d0b0d65 100644
--- a/administrator/components/com_menus/src/Controller/DisplayController.php
+++ b/administrator/components/com_menus/src/Controller/DisplayController.php
@@ -60,6 +60,10 @@ public function display($cachable = false, $urlparams = false)
                     $uri->setVar('forcedLanguage', $forcedLanguage);
                 }
 
+                if ($function = $this->input->post->get('function')) {
+                    $uri->setVar('function', $function);
+                }
+
                 $this->setRedirect(Route::_('index.php' . $uri->toString(['query']), false));
 
                 return parent::display();

From 231758db6e906fa5cc1e1328d011e16ff5204c9c Mon Sep 17 00:00:00 2001
From: janschoenherr <jan@yootheme.com>
Date: Mon, 20 Nov 2023 08:13:29 +0000
Subject: [PATCH 2/3] Move function parameter to form url

---
 .../components/com_menus/src/Controller/DisplayController.php | 4 ----
 administrator/components/com_menus/tmpl/items/modal.php       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/administrator/components/com_menus/src/Controller/DisplayController.php b/administrator/components/com_menus/src/Controller/DisplayController.php
index 344162d0b0d65..5eba2c6ef97c5 100644
--- a/administrator/components/com_menus/src/Controller/DisplayController.php
+++ b/administrator/components/com_menus/src/Controller/DisplayController.php
@@ -60,10 +60,6 @@ public function display($cachable = false, $urlparams = false)
                     $uri->setVar('forcedLanguage', $forcedLanguage);
                 }
 
-                if ($function = $this->input->post->get('function')) {
-                    $uri->setVar('function', $function);
-                }
-
                 $this->setRedirect(Route::_('index.php' . $uri->toString(['query']), false));
 
                 return parent::display();
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 0943ac02a5fc2..886a76a1c0bba 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -33,7 +33,7 @@
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$link      = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . Session::getFormToken() . '=1';
+$link      = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . Session::getFormToken() . '=1&function=' . $function;
 $multilang = Multilanguage::isEnabled();
 
 if (!empty($editor)) {

From 41022b75ff7fd928ddee4c575f017611ee3bccf7 Mon Sep 17 00:00:00 2001
From: janschoenherr <jan@yootheme.com>
Date: Mon, 20 Nov 2023 08:20:44 +0000
Subject: [PATCH 3/3] Remove hidden input

---
 administrator/components/com_menus/tmpl/items/modal.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 886a76a1c0bba..dd11a10cb5e53 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -40,7 +40,7 @@
     // This view is used also in com_menus. Load the xtd script only if the editor is set!
     $this->document->addScriptOptions('xtd-menus', ['editor' => $editor]);
     $onclick = "jSelectMenuItem";
-    $link    = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . Session::getFormToken() . '=1';
+    $link    = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . Session::getFormToken() . '=1&function=' . $function;
 }
 ?>
 <div class="container-popup">
@@ -186,7 +186,6 @@
 
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="function" value="<?php echo $function; ?>">
         <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>