Further delete and event trigger fixes

git-svn-id: https://code.elgg.org/elgg/trunk@412 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 17 insertions, 11 deletions

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index f2b9e16fb..7e8caaab6 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -397,18 +397,24 @@
 		
 		$guid = (int)$guid;
 		$name = get_metastring_id($name);
+		

+		$entity_guid = (int)$entity_guid;

+		if ($entity = get_entity($entity_guid)) {

+			if ($entity->canEdit()) {

 		
-		$where = array();
-		
-		if ($name != "")
-			$where[] = " name_id='$name'";
-		
-		$query = "DELETE from {$CONFIG->dbprefix}annotations where entity_guid=$guid and "; 
-		foreach ($where as $w)
-			$query .= " $w and ";
-		$query .= "(access_id in {$access} or (access_id = 0 and owner_guid = {$_SESSION['id']}))";
-		
-		return delete_data();
+				$where = array();
+				
+				if ($name != "")
+					$where[] = " name_id='$name'";
+				
+				$query = "DELETE from {$CONFIG->dbprefix}annotations where entity_guid=$guid "; 
+				foreach ($where as $w)
+					$query .= " and $w";
+				
+				return delete_data($query);

+		

+			}

+		}
 	}
 	
 	/**