From 237caef7b9358b08e75145a6c4fec53ad04cb7b1 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 1 Mar 2010 16:21:36 +0000
Subject: Fixes #1558: Applied Cash's patch.  Added unit tests to test for
 regressions for any bugs fixed in trac.

git-svn-id: http://code.elgg.org/elgg/trunk@3979 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/annotations.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'engine/lib/annotations.php')

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 666b83309..b18475d57 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -1146,6 +1146,7 @@ function delete_annotation($id) {
  * Clear all the annotations for a given entity, assuming you have access to that metadata.
  *
  * @param int $guid
+ * @return number of annotations deleted or false if an error
  */
 function clear_annotations($guid, $name = "") {
 	global $CONFIG;
@@ -1154,6 +1155,10 @@ function clear_annotations($guid, $name = "") {
 
 	if (!empty($name)) {
 		$name = get_metastring_id($name);
+		if ($name === false) {
+			// name doesn't exist so 0 rows were deleted
+			return 0;
+		}
 	}
 
 	$entity_guid = (int) $guid;
@@ -1173,6 +1178,8 @@ function clear_annotations($guid, $name = "") {
 			return delete_data($query);
 		}
 	}
+	
+	return FALSE;
 }
 
 /**
-- 
cgit v1.2.3