aboutsummaryrefslogtreecommitdiff
path: root/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 /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 'views/default/annotation')
-rw-r--r--views/default/annotation/annotate.php2
-rw-r--r--views/default/annotation/annotatelike.php2
-rw-r--r--views/default/annotation/generic_comment.php2
-rw-r--r--views/default/annotation/latest_comments.php2
-rw-r--r--views/default/annotation/likes.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 5cd2879c2..bfef8e08e 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -12,7 +12,7 @@
$comment = get_annotation($vars['item']->annotation_id)->value;
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
- $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link'>Comment</a>";
+ $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "</span>";
if(get_context() != 'riverdashboard'){
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
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 56948aaf4..5b9c62840 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -36,7 +36,7 @@ $owner = get_user($vars['annotation']->owner_guid);
<p class="generic_comment_owner">
<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
<span class="entity_subtext">
- <?php echo friendly_time($vars['annotation']->time_created); ?>
+ <?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?>
</span>
</p>
<!-- output the actual comment -->
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index e1181b63e..79a50fea1 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -11,7 +11,7 @@ if($vars['comments']){
$entity = get_entity($comment->entity_guid);
//comment owner
$comment_owner = get_user($comment->owner_guid);
- $friendlytime = friendly_time($comment->time_created); // get timestamp for comment
+ $friendlytime = elgg_view_friendly_time($comment->time_created); // get timestamp for comment
//set the title
if($entity->title){
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 2808664df..cb7424f7d 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -34,7 +34,7 @@ $owner = get_user($vars['annotation']->owner_guid);
?>
<p class="elgg_likes_owner">
<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') .
- " <span class=\"entity_subtext\">" . friendly_time($vars['annotation']->time_created) . "</span>"; ?>
+ " <span class=\"entity_subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
</p>
</div>
</div> \ No newline at end of file