From 8207201c6a4e8f1ca21f02861be936ad547e349d Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Sun, 31 Oct 2010 05:19:43 +0000 Subject: [PATCH] merge r7225 to trunk --- chrome/content/zotero/xpcom/integration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index e5f77767e..4b8ff25e8 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -234,7 +234,7 @@ Zotero.Integration = new function() { // service try { var componentClass = "@zotero.org/Zotero/integration/application?agent="+agent+";1"; - Zotero.debug("Integration: Instantiating "+componentClass+" for command "+command); + Zotero.debug("Integration: Instantiating "+componentClass+" for command "+command+(docId ? " with doc "+docId : "")); var application = Components.classes[componentClass] .getService(Components.interfaces.zoteroIntegrationApplication); } catch(e) { @@ -1113,7 +1113,7 @@ Zotero.Integration.Session.prototype.getCitationField = function(citation) { var properties = JSON.stringify(citation.properties, saveProperties); if(properties != "{}") { - field.push('"properties":'+properties); + field.push('"properties":{'+properties+"}"); } var citationItems = [];