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/river/item/wrapper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'views/default/river/item/wrapper.php')

diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index a00273648..6391f23fb 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -28,7 +28,7 @@ if($avatar_icon == "icon"){
 						?>
 						<span class="entity_subtext">
 							(<?php
-								echo friendly_time($vars['item']->posted);
+								echo elgg_view_friendly_time($vars['item']->posted);
 							?>)
 						</span>
 					</p>
@@ -53,7 +53,7 @@ if($avatar_icon == "icon"){
 			?>
 			<span class="entity_subtext">
 				(<?php
-					echo friendly_time($vars['item']->posted);
+					echo elgg_view_friendly_time($vars['item']->posted);
 				?>)
 			</span>
 		</p>
-- 
cgit v1.2.3