Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix folder browsing and file upload that broke in 3.8.8 due to escaping #20586

Merged
merged 3 commits into from
May 28, 2018
Merged

Fix folder browsing and file upload that broke in 3.8.8 due to escaping #20586

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a80a72e
Fix de-escaping of slash in folder name
PhilETaylor May 27, 2018
c68c679
code style
PhilETaylor May 27, 2018
579a6ed
Update popup-imagemanager.js
PhilETaylor May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix de-escaping of slash in folder name
  • Loading branch information
Phil E. Taylor committed May 27, 2018
commit a80a72eb833fc82c45c41652213369af1990ef77
3 changes: 2 additions & 1 deletion media/media/js/popup-imagemanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "/");
},

/**
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion media/media/js/popup-imagemanager.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.