From 0ac95bfacd51cb7776738eaf01e53a05e7e87f26 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 9 Jul 2009 07:18:06 +0000
Subject: [PATCH] - Don't send sourceItemKey if empty - Remove stack trace on
 sync error, since it's mostly just annoying

---
 chrome/content/zotero/xpcom/sync.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index 47743d668..05df248fd 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -1712,15 +1712,7 @@ Zotero.Sync.Server = new function () {
 		
 		Zotero.Sync.Runner.setError(e.message ? e.message : e);
 		Zotero.Sync.Runner.reset();
-		try {
-			undefinedFunction();
-		}
-		catch (e) {
-			// Log stack trace to error console
-			if (e.stack) {
-				Components.utils.reportError(e.stack.substr(0, 600));
-			}
-		}
+		
 		throw (e);
 	}
 }
@@ -2882,7 +2874,9 @@ Zotero.Sync.Server.Data = new function() {
 		}
 		
 		if (item.primary.itemType == 'note' || item.primary.itemType == 'attachment') {
-			xml.@sourceItem = item.sourceItemKey;
+			if (item.sourceItemKey) {
+				xml.@sourceItem = item.sourceItemKey;
+			}
 		}
 		
 		// Note