aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-06 16:13:39 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-06 17:00:22 +0200
commit254576e1f7f5ec610ddbd9de81005397191cf52f (patch)
tree514fdb766d105eada395da5f883fdc520c23eec3 /core/js
parentcaefe23bb610308324d9436dd7c1e109118062eb (diff)
downloadnextcloud-server-254576e1f7f5ec610ddbd9de81005397191cf52f.tar.gz
nextcloud-server-254576e1f7f5ec610ddbd9de81005397191cf52f.zip
Do not encode slashes in "dir" URL param in files JS
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js
index edee72ca3ca..0d7207b7abb 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -2160,7 +2160,12 @@ OC.Util.History = {
if (!this._handlers.length) {
return;
}
- params = (e && e.state) || this.parseUrlQuery() || {};
+ params = (e && e.state);
+ if (_.isString(params)) {
+ params = OC.parseQueryString(params);
+ } else if (!params) {
+ params = this.parseUrlQuery() || {};
+ }
for (var i = 0; i < this._handlers.length; i++) {
this._handlers[i](params);
}