diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-09-28 18:37:40 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-09-28 18:37:40 +0200 |
| commit | 71dabc6c133b8fdbe26b697de6f9be0f605b6224 (patch) | |
| tree | 20f0f91910bb56d704c7e4007fac150bebfee6bd /core/js/js.js | |
| parent | d68079f93210f8fe0b5327e686497db97fde6a3e (diff) | |
| download | nextcloud-server-71dabc6c133b8fdbe26b697de6f9be0f605b6224.tar.gz nextcloud-server-71dabc6c133b8fdbe26b697de6f9be0f605b6224.zip | |
Consider both hash params and query when parsing URL
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 1 insertions, 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 || {}; }, |