From c9d4cf5b0b0f5ad3056cd4d6dc744a8b4890fb4e Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
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/ElggAnnotation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine/classes/ElggAnnotation.php')

diff --git a/engine/classes/ElggAnnotation.php b/engine/classes/ElggAnnotation.php
index 274cbb923..f61ea520d 100644
--- a/engine/classes/ElggAnnotation.php
+++ b/engine/classes/ElggAnnotation.php
@@ -39,7 +39,7 @@ class ElggAnnotation extends ElggExtender {
 			if ($id instanceof stdClass) {
 				$annotation = $id;
 			} else {
-				$annotation = get_annotation($id);
+				$annotation = elgg_get_annotation_from_id($id);
 			}
 
 			if ($annotation) {
@@ -122,6 +122,6 @@ class ElggAnnotation extends ElggExtender {
 	 * @return ElggAnnotation
 	 */
 	public function getObjectFromID($id) {
-		return get_annotation($id);
+		return elgg_get_annotation_from_id($id);
 	}
 }
-- 
cgit v1.2.3