From 56a0863a9d19e9d010af4b522812437790e29c69 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 30 Jan 2007 06:16:03 +0000
Subject: [PATCH] Fixes #520, deleting items from smart collections/search
 fails under certain circumstances

Simon, reopen if this doesn't fix the problem you were referring to.

(Also removes Notifier.enable()/disable() from its use in Item.erase() while we're at it.)
---
 chrome/content/zotero/xpcom/data_access.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data_access.js b/chrome/content/zotero/xpcom/data_access.js
index f2585a92a..711560343 100644
--- a/chrome/content/zotero/xpcom/data_access.js
+++ b/chrome/content/zotero/xpcom/data_access.js
@@ -1868,19 +1868,9 @@ Zotero.Item.prototype.erase = function(deleteChildren){
 	// Remove item from parent collections
 	var parentCollectionIDs = this.getCollections();
 	if (parentCollectionIDs){
-		var notifierState = Zotero.Notifier.isEnabled();
-		Zotero.Notifier.disable();
-		
 		for (var i=0; i<parentCollectionIDs.length; i++){
 			Zotero.Collections.get(parentCollectionIDs[i]).removeItem(this.getID());
 		}
-		
-		if (notifierState){
-			Zotero.Notifier.enable();
-		}
-		else {
-			Zotero.Notifier.disable();
-		}
 	}
 	
 	// Note
@@ -2373,7 +2363,7 @@ Zotero.Items = new function(){
 				var item = this.get(id);
 				if (!item) {
 					Zotero.debug('Item ' + id + ' does not exist in Items.erase()!', 1);
-					Zotero.Notifier.trigger('item', 'delete', id);
+					Zotero.Notifier.trigger('delete', 'item', id);
 					continue;
 				}
 				item.erase(eraseChildren); // calls unload()