diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:21:34 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:21:34 +0200 |
| commit | 037cce7f0580485a2e6fffaa0a7d529e0db5779c (patch) | |
| tree | b701f213a9d902bde075d12e9cbd6389f210f2cc /core/js | |
| parent | 69430e03105ef2081371353f4b8cc104cecbe2d4 (diff) | |
| parent | 71dabc6c133b8fdbe26b697de6f9be0f605b6224 (diff) | |
| download | nextcloud-server-037cce7f0580485a2e6fffaa0a7d529e0db5779c.tar.gz nextcloud-server-037cce7f0580485a2e6fffaa0a7d529e0db5779c.zip | |
Merge pull request #19418 from owncloud/fix-parsehashquery
Consider both hash params and query when parsing URL
Diffstat (limited to 'core/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 || {}; }, |