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 /mod | |
| 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 'mod')
| -rw-r--r-- | mod/blog/lib/blog.php | 2 | ||||
| -rw-r--r-- | mod/messageboard/actions/delete.php | 2 | ||||
| -rw-r--r-- | mod/pages/revision.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index fdd408feb..ede87386c 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -296,7 +296,7 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) { $title .= ": \"$blog->title\""; if ($revision) { - $revision = get_annotation((int)$revision); + $revision = elgg_get_annotation_from_id((int)$revision); $vars['revision'] = $revision; $title .= ' ' . elgg_echo('blog:edit_revision_notice'); diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php index 6e72c201e..1cc20f285 100644 --- a/mod/messageboard/actions/delete.php +++ b/mod/messageboard/actions/delete.php @@ -10,7 +10,7 @@ $annotation_id = (int) get_input('annotation_id'); //make sure that there is a message on the message board matching the passed id -if ($message = get_annotation($annotation_id)) { +if ($message = elgg_get_annotation_from_id($annotation_id)) { //grab the user or group entity $entity = get_entity($message->entity_guid); diff --git a/mod/pages/revision.php b/mod/pages/revision.php index 1945bb8af..1537e0355 100644 --- a/mod/pages/revision.php +++ b/mod/pages/revision.php @@ -6,7 +6,7 @@ */ $id = get_input('id'); -$annotation = get_annotation($id); +$annotation = elgg_get_annotation_from_id($id); if (!$annotation) { forward(); } |