aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-12 23:20:41 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-12 23:20:41 +0000
commite1f6f69e639881496a10a1888b66976c1f581e98 (patch)
treeaa13521bd55694cf84405876e565096e841903ee /views/default
parent4dd7d2be5352ac20d3eb2693d78954718c704cbc (diff)
downloadelgg-e1f6f69e639881496a10a1888b66976c1f581e98.tar.gz
elgg-e1f6f69e639881496a10a1888b66976c1f581e98.tar.bz2
Refs #650. Replaced list_annotations() by elgg_list_annotations().
git-svn-id: http://code.elgg.org/elgg/trunk@8187 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-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
3 files changed, 7 insertions, 3 deletions
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');