From 9fe91052a19d4c3518c58fd3ef0b14cbade7f285 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Tue, 27 Mar 2018 22:29:32 +0200
Subject: [PATCH 1/3] fixit

---
 .../components/com_modules/views/modules/tmpl/modal.php  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php
index a44d0517b4978..61a0410df5fe4 100644
--- a/administrator/components/com_modules/views/modules/tmpl/modal.php
+++ b/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -31,10 +31,16 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $editor    = JFactory::getApplication()->input->get('editor', '', 'cmd');
+$link      = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1';
+
+if (!empty($editor))
+{
+	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . $editor . '&'  . JSession::getFormToken() . '=1';
+}
 ?>
 <div class="container-popup">
 
-	<form action="<?php echo JRoute::_('index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm">
+	<form action="<?php echo JRoute::_($link); ?>" method="post" name="adminForm" id="adminForm">
 
 		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if ($this->total > 0) : ?>
@@ -123,6 +129,7 @@
 
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="editor" value="<?php echo $editor; ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 
 	</form>

From 95b15c2e7b68ed5829f54ea48e206ec6defc9690 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Tue, 27 Mar 2018 23:10:40 +0200
Subject: [PATCH 2/3] cs

---
 .../components/com_modules/views/modules/tmpl/modal.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php
index 61a0410df5fe4..04ed6de11457a 100644
--- a/administrator/components/com_modules/views/modules/tmpl/modal.php
+++ b/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -35,7 +35,7 @@
 
 if (!empty($editor))
 {
-	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . $editor . '&'  . JSession::getFormToken() . '=1';
+	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . $editor . '&' . JSession::getFormToken() . '=1';
 }
 ?>
 <div class="container-popup">

From 1d0b171b5751a888f36c1712b5ce7d0608f670e1 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Sun, 1 Apr 2018 21:01:06 +0200
Subject: [PATCH 3/3] Update modal.php

---
 .../components/com_modules/views/modules/tmpl/modal.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php
index 04ed6de11457a..577bfa8d64085 100644
--- a/administrator/components/com_modules/views/modules/tmpl/modal.php
+++ b/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -35,7 +35,7 @@
 
 if (!empty($editor))
 {
-	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . $editor . '&' . JSession::getFormToken() . '=1';
+	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&editor=' . $editor . '&' . JSession::getFormToken() . '=1';
 }
 ?>
 <div class="container-popup">