From 8c0059ec266c0e79ce18bce30d44350a3b6c0742 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Fri, 3 May 2013 12:32:30 -0400
Subject: [PATCH] Use unicode-safe encoding of script ID in options URL.

Refs #1732
---
 content/scriptprefs.js | 2 +-
 modules/addons4.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/scriptprefs.js b/content/scriptprefs.js
index efc765a4d..d2bc74894 100644
--- a/content/scriptprefs.js
+++ b/content/scriptprefs.js
@@ -1,6 +1,6 @@
 Components.utils.import('resource://greasemonkey/util.js'); // ref'd in XUL
 
-var gScriptId = atob(location.hash.substring(1));
+var gScriptId = location.hash.substring(1);
 var gScript = GM_util.getService().config.getMatchingScripts(function(script) {
   return script.id == gScriptId;
 })[0];
diff --git a/modules/addons4.js b/modules/addons4.js
index 76b40ac42..4e0454b36 100755
--- a/modules/addons4.js
+++ b/modules/addons4.js
@@ -149,7 +149,7 @@ function ScriptAddon_getIsActive() {
 ScriptAddon.prototype.__defineGetter__('optionsURL',
 function ScriptAddon_getOptionsURL() {
   return 'chrome://greasemonkey/content/scriptprefs.xul#'
-      + btoa(this._script.id);
+      + encodeURIComponent(this._script.id);
 });
 
 ScriptAddon.prototype.__defineGetter__('userDisabled',