aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/pages/views/default/pages/sidebar/history.php8
-rw-r--r--views/default/core/likes/display.php2
-rw-r--r--views/default/core/river/controls.php2
-rw-r--r--views/default/layout/elements/comments.php6
4 files changed, 14 insertions, 4 deletions
diff --git a/mod/pages/views/default/pages/sidebar/history.php b/mod/pages/views/default/pages/sidebar/history.php
index dad06ab4f..beff41e03 100644
--- a/mod/pages/views/default/pages/sidebar/history.php
+++ b/mod/pages/views/default/pages/sidebar/history.php
@@ -8,7 +8,13 @@
$title = elgg_echo('pages:history');
if ($vars['page']) {
- $content = $content = list_annotations($vars['page']->guid, 'page', 20, false);
+ $options = array(
+ 'guid' => $vars['page']->guid,
+ 'annotation_name' => 'page',
+ 'limit' => 20,
+ 'reverse_order_by' => true
+ );
+ $content = elgg_list_annotaitons($options);
}
echo elgg_view_module('aside', $title, $content); \ No newline at end of file
diff --git a/views/default/core/likes/display.php b/views/default/core/likes/display.php
index a2f6b7799..d00294d2d 100644
--- a/views/default/core/likes/display.php
+++ b/views/default/core/likes/display.php
@@ -58,7 +58,7 @@ if ($num_of_likes) {
);
$list = elgg_view('output/url', $params);
$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix'>";
- $list .= list_annotations($guid, 'likes', 99);
+ $list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
$list .= "</div>";
}
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index dd9de656d..37bfba91b 100644
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -32,7 +32,7 @@ if (elgg_is_logged_in()) {
$options = array(
'guid' => $guid,
'annotation_name' => 'likes',
- 'owner_guid' => get_logged_in_user_guid()
+ 'owner_guid' => elgg_get_logged_in_user_guid()
);
$likes = elgg_get_annotations($options);
$url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
diff --git a/views/default/layout/elements/comments.php b/views/default/layout/elements/comments.php
index ca86bed2d..2d727b8b5 100644
--- a/views/default/layout/elements/comments.php
+++ b/views/default/layout/elements/comments.php
@@ -16,7 +16,11 @@ if (isset($vars['id'])) {
echo "<div $id class=\"elgg-comments\">";
-echo list_annotations($vars['entity']->getGUID(), 'generic_comment');
+$options = array(
+ 'guid' => $vars['entity']->getGUID(),
+ 'annotation_name' => 'generic_comment'
+);
+echo elgg_list_annotations($options);
if ($show_add_form) {
$form_vars = array('name' => 'elgg_add_comment');