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/annotatelike.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/views/default/annotation/annotatelike.php b/views/default/annotation/annotatelike.php
index 6a2dcd4ca..43655ba6e 100644
--- a/views/default/annotation/annotatelike.php
+++ b/views/default/annotation/annotatelike.php
@@ -6,6 +6,6 @@ $url = $object->getURL();
 $title = $object->title;
  
 $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created)."</span>";
+$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
 	
 echo $string;
\ No newline at end of file
-- 
cgit v1.2.3