aboutsummaryrefslogtreecommitdiff
path: root/mod/pages/views/default/river/object
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 /mod/pages/views/default/river/object
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 'mod/pages/views/default/river/object')
-rw-r--r--mod/pages/views/default/river/object/page/create.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index dc4554404..728978178 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -13,7 +13,7 @@ $url = $object->getURL();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
-$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "<div class=\"river_content_display\">";
$string .= elgg_make_excerpt($contents, 200);