Fix keyword search parameter encoding.

convertFromUnicode appears to have been removed in FF51; this is a minimal fix. Fixes #201.
5digits · Feb 14, 2017 · f93718d · f93718d
1 parent dbfb4eb
commit f93718d
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
@@ -372,8 +372,18 @@ var Bookmarks = Module("bookmarks", {
                 }
                 catch (e) {}
 
-            if (charset)
-                var encodedParam = escape(window.convertFromUnicode(charset, param)).replace(/\+/g, encodeURIComponent);
+            if (charset) {
+                try {
+                    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                                        createInstance(Ci.nsIScriptableUnicodeConverter);
+                    converter.charset = charset;
+                    var encodedParam = converter.ConvertFromUnicode(param) + converter.Finish();
+                }
+                catch (e) {
+                    encodedParam = param;
+                }
+                encodedParam = escape(encodedParam).replace(/\+/g, encodeURIComponent);
+            }
             else
                 encodedParam = bookmarkcache.keywords[keyword.toLowerCase()].encodeURIComponent(param);