From c9d4cf5b0b0f5ad3056cd4d6dc744a8b4890fb4e Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 14 Feb 2011 03:40:59 +0000 Subject: Updated trunk to use new annotation functions. Added checks for annotations_* options vs annotation_* options because it's so easy to confuse. git-svn-id: http://code.elgg.org/elgg/trunk@8223 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/classes/ElggEntity.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/classes/ElggEntity.php') diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php index 3dc5088f5..1be1d5d15 100644 --- a/engine/classes/ElggEntity.php +++ b/engine/classes/ElggEntity.php @@ -599,7 +599,7 @@ abstract class ElggEntity extends ElggData implements 'limit' => 0 ); if ($name) { - $options['annotations_name'] = $name; + $options['annotation_name'] = $name; } return elgg_delete_annotations($options); @@ -618,11 +618,11 @@ abstract class ElggEntity extends ElggData implements // no longer have access to an entity they created annotations on. $ia = elgg_set_ignore_access(true); $options = array( - 'annotations_owner_guid' => $this->guid, + 'annotation_owner_guid' => $this->guid, 'limit' => 0 ); if ($name) { - $options['annotations_name'] = $name; + $options['annotation_name'] = $name; } $r = elgg_delete_annotations($options); @@ -643,7 +643,7 @@ abstract class ElggEntity extends ElggData implements 'limit' => 0 ); if ($name) { - $options['annotations_name'] = $name; + $options['annotation_name'] = $name; } return elgg_disable_annotations($options); @@ -664,7 +664,7 @@ abstract class ElggEntity extends ElggData implements 'limit' => 0 ); if ($name) { - $options['annotations_name'] = $name; + $options['annotation_name'] = $name; } return elgg_enable_annotations($options); -- cgit v1.2.3