From 9479a32a9110c7d2e7a46d760594e7974b6cc558 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 17 Dec 2012 21:02:45 -0800
Subject: [PATCH] Fix cookie manager exploding in newer Firefoxen.

---
 common/modules/dom.jsm       | 11 +++++++++++
 common/modules/sanitizer.jsm |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 7b74f491..10d0ce07 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -719,6 +719,15 @@ var DOM = Class("DOM", {
         }, this);
     },
 
+    fragment: function fragment() {
+        let frag = this.document.createDocumentFragment();
+        this.appendTo(frag);
+        return this;
+    },
+
+    clone: function clone(deep)
+        this.map(function (elem) elem.cloneNode(deep)),
+
     toggle: function toggle(val, self) {
         if (callable(val))
             return this.each(function (elem, i) {
@@ -1535,6 +1544,8 @@ var DOM = Class("DOM", {
                 return args.toDOM(doc, namespaces, nodes);
             if (args instanceof Ci.nsIDOMNode)
                 return args;
+            if (args instanceof DOM)
+                return args.fragment();
             if ("toJSONXML" in args)
                 args = args.toJSONXML();
 
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index ab408b84..f39cf131 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -498,7 +498,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
             }
             function setPerms(host, perm) {
                 let uri = util.createURI(host);
-                services.permissions.remove(uri, "cookie");
+                services.permissions.remove(uri.host, "cookie");
                 services.permissions.add(uri, "cookie", Sanitizer.PERMS[perm]);
             }
             commands.add(["cookies", "ck"],