From 8d96cf35bb20be7d911265a354dad14a6491794b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 3 Feb 2012 22:10:58 -0500
Subject: [PATCH 1/4] Fix global assignment

---
 chrome/content/zotero/zoteroPane.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index c101e9c906..a41c6b57b1 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3169,10 +3169,10 @@ var ZoteroPane = new function()
 		
 		if (item.libraryID) {
 			var group = Zotero.Groups.getByLibraryID(item.libraryID);
-			filesEditable = group.filesEditable;
+			var filesEditable = group.filesEditable;
 		}
 		else {
-			filesEditable = true;
+			var filesEditable = true;
 		}
 		
 		if (saveSnapshot) {

From deeb1b22473049c8f2d8dd5c416a71f589a0373b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 3 Feb 2012 22:41:20 -0500
Subject: [PATCH 2/4] Add MIME type for locate icon

---
 chrome/content/zotero/xpcom/locateManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/locateManager.js b/chrome/content/zotero/xpcom/locateManager.js
index aa0a11d71f..7f3c93b4ef 100644
--- a/chrome/content/zotero/xpcom/locateManager.js
+++ b/chrome/content/zotero/xpcom/locateManager.js
@@ -202,7 +202,8 @@ Zotero.LocateManager = new function() {
 			"image/png":"png",
 			"image/jpeg":"jpg",
 			"image/gif":"gif",
-			"image/x-icon":"ico"
+			"image/x-icon":"ico",
+			"image/vnd.microsoft.icon":"ico"
 		};
 		
 		// ensure there is an icon

From ee51b493772ee946807ec69aa02e2a5ea0ce076a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 4 Feb 2012 15:20:46 -0500
Subject: [PATCH 3/4] Center save icon guidance panel

---
 chrome/content/zotero/overlay.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index f408ebb92c..acb241d241 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -77,7 +77,7 @@
 		<image src="chrome://zotero/skin/treeitem-book.png" id="zotero-status-image"
 			onclick="if(event.button === 0) Zotero_Browser.scrapeThisPage()" context="zotero-status-image-context"
 			position="1" hidden="true"/>
-		<zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image"/>
+		<zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image" x="8"/>
 	</hbox>
 		
 	<menupopup id="menu_ToolsPopup">

From dca22a012cdb19c0e6f994341f9a457a17152ced Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 5 Feb 2012 01:49:08 -0500
Subject: [PATCH 4/4] Debugging for tag issue

---
 chrome/content/zotero/xpcom/data/tag.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
index 05bb9d34e8..508b657700 100644
--- a/chrome/content/zotero/xpcom/data/tag.js
+++ b/chrome/content/zotero/xpcom/data/tag.js
@@ -353,7 +353,15 @@ Zotero.Tag.prototype.save = function (full) {
 			
 			var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
 				+ " WHERE tagID=?";
-			Zotero.DB.query(sql, sqlValues);
+			try {
+				Zotero.DB.query(sql, sqlValues);
+			}
+			// TEMP
+			catch (e) {
+				var sql = "SELECT * FROM tags";
+				Zotero.debug(Zotero.DB.query(sql));
+				throw (e);
+			}
 		}