Merge pull request #3116 from greenwizard88/master

Fix for #2886: Web throttle doesn't like roster entries with "&"
JMRI · Feb 21, 2017 · ca36c37 · ca36c37
2 parents 878f435 + 845357a
commit ca36c37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/web/js/webThrottle.js b/web/js/webThrottle.js
@@ -1700,7 +1700,7 @@ var throttleShow = function(e, locoId) {
 	if (!isLeftButton(e)) return;
 	e.preventDefault();
 	e.stopImmediatePropagation();
-	var url = document.URL.split('?')[0] + '?loconame=' + encodeURI(locoId);
+	var url = document.URL.split('?')[0] + '?loconame=' + encodeURIComponent(locoId);
 	if ($toFrame) {
 		if (addToFrameList(url + '&inframe')) window.open(document.URL.split('?')[0], $pageInFrame ? '_top' : '_self');
 	} else window.open(url, url);