aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-25 13:29:23 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-25 13:29:23 +0000
commitf87298cded18dc2f4aa5c56370f8d5aa33d93160 (patch)
treecb0012c9318f7847b5276780da70af90c4dc8745
parentf22f9bd9b4fb5834d90bb12016a00442d3e4ca8e (diff)
downloadelgg-f87298cded18dc2f4aa5c56370f8d5aa33d93160.tar.gz
elgg-f87298cded18dc2f4aa5c56370f8d5aa33d93160.tar.bz2
Count annotations now fails properly if a metastring is not found. Fixes #377
git-svn-id: https://code.elgg.org/elgg/trunk@2133 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/annotations.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 4d84b2d34..92253bf1d 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -576,6 +576,8 @@
$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
$name = get_metastring_id($name);
+ if (empty($name)) return 0;
+
$where = array();
if ($entity_guid)