From 71dabc6c133b8fdbe26b697de6f9be0f605b6224 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 18:37:40 +0200
Subject: [PATCH] Consider both hash params and query when parsing URL
---
core/js/js.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index b5971bfc579..397fea8e3c5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1773,9 +1773,7 @@ OC.Util.History = {
params = OC.parseQueryString(this._decodeQuery(query));
}
// else read from query attributes
- if (!params) {
- params = OC.parseQueryString(this._decodeQuery(location.search));
- }
+ params = _.extend(params || {}, OC.parseQueryString(this._decodeQuery(location.search)));
return params || {};
},
--
GitLab