From 3d555e030a3b875bbb780a21cfdf80416147202c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 2 Sep 2010 02:03:10 +0000
Subject: [PATCH] Commons:

- Don't break reloading on "Invalid response retrieving file upload parameters"
- Don't break loading if a <file> doesn't have a <format>
---
 chrome/content/zotero/xpcom/commons.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/commons.js b/chrome/content/zotero/xpcom/commons.js
index 49645c19d..9d7777803 100644
--- a/chrome/content/zotero/xpcom/commons.js
+++ b/chrome/content/zotero/xpcom/commons.js
@@ -499,10 +499,16 @@ Zotero.Commons.Bucket.prototype.getItems = function (callback) {
 		}
 		catch (e) {
 			alert("Invalid response retrieving file upload parameters");
+			this._itemsLoading = false;
 			return;
 		}
 		
-		var zipsXML = xml.file.(@source == 'original').(format == 'Zotero ZIP Item');
+		try {
+			var zipsXML = xml.file.(@source == 'original').(typeof format != 'undefined' && format == 'Zotero ZIP Item');
+		}
+		catch (e) {
+			return;
+		}
 		
 		Zotero.debug(zipsXML);