From e52ea34e2bae8f0d5fd51b9e24c50dd96f61a967 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 28 Oct 2008 05:18:55 +0000
Subject: [PATCH] Fix obj.isAttachment() sync error (which really should be a
 "Reconciliation unimplemented" error)

---
 chrome/content/zotero/xpcom/sync.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index de8f51352..876f0bf0b 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -1576,17 +1576,19 @@ Zotero.Sync.Server.Data = new function() {
 											continue;
 										}
 										break;
-									
-									default:
-										Zotero.debug(obj);
-										Zotero.debug(remoteObj);
-										var msg = "Reconciliation unimplemented for " + types;
-										alert(msg);
-										throw(msg);
 								}
 								
-								if (obj.isAttachment()) {
-									var msg = "Reconciliation unimplemented for attachment items";
+								if (type == 'item') {
+									if (obj.isAttachment()) {
+										var msg = "Reconciliation unimplemented for attachment items";
+										alert(msg);
+										throw(msg);
+									}
+								}
+								else {
+									Zotero.debug(obj);
+									Zotero.debug(remoteObj);
+									var msg = "Reconciliation unimplemented for " + types;
 									alert(msg);
 									throw(msg);
 								}