Merge branch 'master' into v3

2013-04-01 20:15:20 +02:00 · 2013-04-01 20:15:20 +02:00 · 4318413a92
commit 4318413a92
parent c3a09159a3 b5a3de3395
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 master

+2.39.2
+- Mayhem
+  Fix importing settings containing unicode characters.
+
 2.39.1
 - Mayhem
  Add /gd/, /out/, /vp/ and /vr/ archive redirection.
--- a/src/features.coffee
+++ b/src/features.coffee
@ -402,7 +402,7 @@ Settings =
    reader = new FileReader()
    reader.onload = (e) ->
      try
-        data = JSON.parse decodeURIComponent escape e.target.result
+        data = JSON.parse e.target.result
        Settings.loadSettings data
        if confirm 'Import successful. Refresh now?'
          window.location.reload()