Merge pull request #1430 from longsleep/fixup-getURLParameter

Fixup getURLParameter 'null' return and encoding support
2016-09-19 23:59:57 +07:00 · 2016-09-19 23:59:57 +07:00 · d2887b76bc
parent f4a4578f0d c80c5ad958
commit d2887b76bc
1 changed files with 4 additions and 3 deletions
--- a/core/js/js.js
+++ b/core/js/js.js
@ -1722,9 +1722,10 @@ function formatDate(timestamp){
 * @return {string}
 */
 function getURLParameter(name) {
-	return decodeURI(
-			(RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1]
-			);
+	return decodeURIComponent(
+		(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(
+			location.search)||[,''])[1].replace(/\+/g, '%20')
+		)||'';
 }

 /**