From 00294f2553ea991a5a4fbbef835829147f92dbb6 Mon Sep 17 00:00:00 2001
From: Simon Asika <asika32764@gmail.com>
Date: Mon, 27 Mar 2017 23:06:52 +0800
Subject: [PATCH] Move return val out

---
 plugins/installer/packageinstaller/tmpl/default.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index 83c5395a86f78..da39540402897 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -44,12 +44,12 @@
 			$('#uploader-wrapper').hide();
 			return;
 		}
-		
+
 		var dragZone  = $('#dragarea');
 		var fileInput = $('#install_package');
 		var button    = $('#select-file-button');
 		var url       = 'index.php?option=com_installer&task=install.ajax_upload';
-		var returnUrl = '{$return}';
+		var returnUrl = $('#installer-return').val();
 
 		if (returnUrl) {
 			url += '&return=' + returnUrl;
@@ -215,4 +215,6 @@
 			<?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_AND_INSTALL'); ?>
 		</button>
 	</div>
+
+	<input id="installer-return" name="return" type="hidden" value="<?php echo $return; ?>" />
 </div>