Fixes greasemonkey#1262.

Only try to parse the supplied base if it's a string, otherwise assume it's already a uri object.
dept42 · Jan 25, 2011 · c838d49 · c838d49
1 parent 3c0c9e0
commit c838d49
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/content/utils.js b/content/utils.js
@@ -315,11 +315,16 @@ function GM_setEnabled(enabled) {
   GM_prefRoot.setValue("enabled", enabled);
 }
 
-function GM_uriFromUrl(url, baseUrl) {
+function GM_uriFromUrl(url, base) {
   var ioService = Components.classes["@mozilla.org/network/io-service;1"]
                                      .getService(Components.interfaces.nsIIOService);
   var baseUri = null;
-  if (baseUrl) baseUri = GM_uriFromUrl(baseUrl);
+  if (typeof base === "string") {
+    baseUri = GM_uriFromUrl(base);
+  } else if (base) {
+    baseUri = base;
+  }
+
   try {
     return ioService.newURI(url, null, baseUri);
   } catch (e) {