2 files changed, 9 insertions, 4 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 47903616a..df0f2a043 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -785,8 +785,12 @@
 		$id = (int)$id;
 		
 		$access = get_access_sql_suffix();
-		
-		return delete_data("DELETE from {$CONFIG->dbprefix}annotations  where id=$id and $access");
+		$annotation = get_annotation($id);
+		
+		if (trigger_elgg_event('delete', 'annotation', $annotation))
+			return delete_data("DELETE from {$CONFIG->dbprefix}annotations  where id=$id and $access");
+			
+		return false;
 	}
 	
 	/**
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index ca127c386..da189fe30 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -362,9 +362,10 @@
 			$metabyname_memcache = new ElggMemcache('metabyname_memcache');
 		if ($metabyname_memcache) $metabyname_memcache->delete("{$metadata->entity_guid}:{$metadata->name_id}");
 		
-		if ($metadata->canEdit())
+		if (($metadata->canEdit()) && (trigger_elgg_event('delete', 'metadata', $obj)))
 			return delete_data("DELETE from {$CONFIG->dbprefix}metadata where id=$id");
-		
+		
+		return false;
 	}
 	
 	/**