summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2012-02-18 17:51:39 +0000
committerJohn McLear <john@mclear.co.uk>2012-02-18 17:51:39 +0000
commit6ba865521afc672631ab36ce0b29b30f1ce5478a (patch)
tree37af89582b0e449741c725387502d365f6107937 /static
parent0d9754760db91349c459af8fb83265bb4f6d7313 (diff)
downloadetherpad-lite-6ba865521afc672631ab36ce0b29b30f1ce5478a.zip
See https://github.com/Wikinaut/etherpad-lite/commit/1caaff9308b44ded73a3dd8e324613d05e4dc614
https://github.com/Pita/etherpad-lite/pull/462
Diffstat (limited to 'static')
-rw-r--r--static/js/pad.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/static/js/pad.js b/static/js/pad.js
index eb480080..537ebed2 100644
--- a/static/js/pad.js
+++ b/static/js/pad.js
@@ -103,7 +103,7 @@ function getParams()
if(userName)
{
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
- settings.globalUserName = unescape(userName);
+ settings.globalUserName = decodeURIComponent(userName);
}
if(hideQRCode)
{