Fix folder browsing and file upload that broke in 3.8.8 due to escapi…

…ng (#20586) * Fix de-escaping of slash in folder name * code style * Update popup-imagemanager.js
joomla · May 28, 2018 · a8d5f7d · a8d5f7d
1 parent 66debe9
commit a8d5f7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/media/media/js/popup-imagemanager.js b/media/media/js/popup-imagemanager.js
@@ -99,7 +99,7 @@
 		 */
 		getImageFolder: function ()
 		{
-			return this.getQueryObject(this.frame.location.search.substring(1)).folder;
+			return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi, "/");
 		},
 
 		/**
@@ -178,6 +178,7 @@
 		 */
 		setFolder: function (folder, asset, author)
 		{
+                       folder = folder.replace(/%2F/gi, "/");
 			for (var i = 0, l = this.folderlist.length; i < l; i++)
 			{
 				if (folder == this.folderlist.options[i].value)

diff --git a/media/media/js/popup-imagemanager.min.js b/media/media/js/popup-imagemanager.min.js