From 252255c2eb36ca10e7c86abce1691e27d6a4a1c6 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 2 Oct 2011 18:21:01 +0000
Subject: [PATCH] Don't always use cross-site mode

---
 chrome/content/zotero/xpcom/utilities_translate.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/utilities_translate.js b/chrome/content/zotero/xpcom/utilities_translate.js
index 9c4c7f23a..af9ca64a9 100644
--- a/chrome/content/zotero/xpcom/utilities_translate.js
+++ b/chrome/content/zotero/xpcom/utilities_translate.js
@@ -232,12 +232,13 @@ Zotero.Utilities.Translate.prototype.processDocuments = function(urls, processor
 	var hiddenBrowser = Zotero.HTTP.processDocuments(urls, function(doc) {
 		if(!processor) return;
 		
-		if(Zotero.isFx && (loc.protocol !== doc.protocol || loc.host !== doc.host)) {
+		var newLoc = doc.location;
+		if(Zotero.isFx && (loc.protocol !== newLoc.protocol || loc.host !== newLoc.host)) {
 			// Cross-site; need to serialize and unserialize
-			processor(Zotero.Translate.SandboxManager.Fx5DOMWrapper(doc));
+			processor(Zotero.Translate.SandboxManager.Fx5DOMWrapper(doc, newLoc.toString()));
 		} else {
 			// Not cross-site; no need to wrap
-			processor(doc);
+			processor(doc, newLoc.toString());
 		}
 	},
 	function() {