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
---
 mod/pages/views/default/annotation/page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/pages/views/default/annotation/page.php')

diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index c59c80567..cc0f67746 100644
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -19,7 +19,7 @@ $owner_guid = $annotation->owner_guid;
 $owner = get_entity($owner_guid);
 
 $rev = sprintf(elgg_echo('pages:revision'),
-	friendly_time($annotation->time_created),
+	elgg_view_friendly_time($annotation->time_created),
 	"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 );
 
-- 
cgit v1.2.3