wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19418 from owncloud/fix-parsehashquery

Browse source 
Consider both hash params and query when parsing URL
This commit is contained in:
Thomas Müller 2015-09-29 13:21:34 +02:00
commit 037cce7f05
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/js/js.js
View file

@ -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 || {};
},