aboutsummaryrefslogtreecommitdiff
path: root/engine/classes
diff options
context:
space:
mode:
Diffstat (limited to 'engine/classes')
-rw-r--r--engine/classes/ElggAnnotation.php4
-rw-r--r--engine/classes/ElggEntity.php10
-rw-r--r--engine/classes/ElggRiverItem.php2
3 files changed, 8 insertions, 8 deletions
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);
}
}
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);
diff --git a/engine/classes/ElggRiverItem.php b/engine/classes/ElggRiverItem.php
index 6ff9b01d1..cdb22239d 100644
--- a/engine/classes/ElggRiverItem.php
+++ b/engine/classes/ElggRiverItem.php
@@ -57,7 +57,7 @@ class ElggRiverItem
* @return ElggAnnotation
*/
public function getAnnotation() {
- return get_annotation($this->annotation_id);
+ return elgg_get_annotation_from_id($this->annotation_id);
}
/**