aboutsummaryrefslogtreecommitdiff
path: root/views/default/annotation/generic_comment.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
commit8a73785aee3e51c26c65053a4de7c5d7f0ebb673 (patch)
tree41e7e607886b0498a0d8d4dc79df6aaa5094d385 /views/default/annotation/generic_comment.php
parentb81f168b0bfc298c6eb1c0a2a857311f076c40bd (diff)
downloadelgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.gz
elgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.bz2
Merged r6586:6587 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/annotation/generic_comment.php')
-rw-r--r--views/default/annotation/generic_comment.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 56948aaf4..5b9c62840 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -36,7 +36,7 @@ $owner = get_user($vars['annotation']->owner_guid);
<p class="generic_comment_owner">
<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
<span class="entity_subtext">
- <?php echo friendly_time($vars['annotation']->time_created); ?>
+ <?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?>
</span>
</p>
<!-- output the actual comment -->