Merge pull request #19418 from owncloud/fix-parsehashquery

Consider both hash params and query when parsing URL
10 years ago · 037cce7f05
1 changed files with 1 additions and 3 deletions
--- 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 || {};
 	},