aboutsummaryrefslogtreecommitdiff
path: root/views/default/river
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/river
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/river')
-rw-r--r--views/default/river/item/wrapper.php4
1 files changed, 2 insertions, 2 deletions
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>