From 8a73785aee3e51c26c65053a4de7c5d7f0ebb673 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 21 Aug 2010 23:58:35 +0000
Subject: Merged r6586:6587 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/generic_comment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/default/annotation/generic_comment.php')

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 -->
-- 
cgit v1.2.3