diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-14 03:40:59 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-14 03:40:59 +0000 |
| commit | c9d4cf5b0b0f5ad3056cd4d6dc744a8b4890fb4e (patch) | |
| tree | 832898dc37e4678a4d77a9338cd46c4feb6bba64 /actions | |
| parent | 8e065905e4172d0ccd01266c6f8e58a65803d011 (diff) | |
| download | elgg-c9d4cf5b0b0f5ad3056cd4d6dc744a8b4890fb4e.tar.gz elgg-c9d4cf5b0b0f5ad3056cd4d6dc744a8b4890fb4e.tar.bz2 | |
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
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/comments/delete.php | 2 | ||||
| -rw-r--r-- | actions/likes/delete.php | 2 | ||||
| -rw-r--r-- | actions/profile/edit.php | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/actions/comments/delete.php b/actions/comments/delete.php index 54eb97077..f8458a152 100644 --- a/actions/comments/delete.php +++ b/actions/comments/delete.php @@ -12,7 +12,7 @@ if (!elgg_is_logged_in()) { // Make sure we can get the comment in question $annotation_id = (int) get_input('annotation_id'); -if ($comment = get_annotation($annotation_id)) { +if ($comment = elgg_get_annotation_from_id($annotation_id)) { $entity = get_entity($comment->entity_guid); diff --git a/actions/likes/delete.php b/actions/likes/delete.php index 168818a60..7d535052d 100644 --- a/actions/likes/delete.php +++ b/actions/likes/delete.php @@ -13,7 +13,7 @@ if (!elgg_is_logged_in()) { // Make sure we can get the comment in question $annotation_id = (int) get_input('annotation_id'); -if ($likes = get_annotation($annotation_id)) { +if ($likes = elgg_get_annotation_from_id($annotation_id)) { $entity = get_entity($likes->entity_guid); diff --git a/actions/profile/edit.php b/actions/profile/edit.php index 260f2aba9..e86053b07 100644 --- a/actions/profile/edit.php +++ b/actions/profile/edit.php @@ -74,7 +74,11 @@ if ($name) { // go through custom fields if (sizeof($input) > 0) { foreach ($input as $shortname => $value) { - remove_metadata($owner->guid, $shortname); + $options = array( + 'guid' => $owner->guid, + 'metadata_name' => $shortname + ); + elgg_delete_metadata($options); if (isset($accesslevel[$shortname])) { $access_id = (int) $accesslevel[$shortname]; } else { |