aboutsummaryrefslogtreecommitdiff
path: root/mod/pages/views/default/annotation
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/annotation
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/annotation')
-rw-r--r--mod/pages/views/default/annotation/page.php2
1 files changed, 1 insertions, 1 deletions
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>"
);