From 55147bdc2632652ee5d06240650e7b1d85773141 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 29 Jun 2009 20:02:45 +0000 Subject: Closes #337: Added checking for metastrings in __get_annotations_calculate_x() git-svn-id: https://code.elgg.org/elgg/trunk@3361 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/annotations.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 309d475d7..79b2a9168 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -580,8 +580,10 @@ $entity_guid = (int)$entity_guid; $entity_type = sanitise_string($entity_type); $entity_subtype = get_subtype_id($entity_type, $entity_subtype); - if ($name != '') $name = get_metastring_id($name); - if ($value != '') $value = get_metastring_id($value); + if ($name != '' AND !$name = get_metastring_id($name)) + return 0; + if ($value != '' AND !$value = get_metastring_id($value)) + return 0; $value_type = sanitise_string($value_type); $owner_guid = (int)$owner_guid; -- cgit v1.2.3