aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-25 13:31:21 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-25 13:31:21 +0000
commit291aefabaa693a45c1b7707ab683fb23af2fbb0d (patch)
tree90d8826cdf234321d1876ba73249098be0d11036 /engine
parentf87298cded18dc2f4aa5c56370f8d5aa33d93160 (diff)
downloadelgg-291aefabaa693a45c1b7707ab683fb23af2fbb0d.tar.gz
elgg-291aefabaa693a45c1b7707ab683fb23af2fbb0d.tar.bz2
Clear annotations now clears annotations properly when no name is specified. Fixes #357
git-svn-id: https://code.elgg.org/elgg/trunk@2134 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/annotations.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 92253bf1d..94fbf7f4e 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -630,7 +630,9 @@
global $CONFIG;
$guid = (int)$guid;
- $name = get_metastring_id($name);
+
+ if (!empty($name))
+ $name = get_metastring_id($name);
$entity_guid = (int) $guid;
if ($entity = get_entity($entity_guid)) {