Merged r6586:6587 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 4 insertions, 4 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>"
 );
 
diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
index 4dc5dc3b3..419fc8d23 100644
--- a/mod/pages/views/default/pages/pagelisting.php
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -24,7 +24,7 @@ if ($latest) {
 
 
 	$info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"),
-					friendly_time($time_updated),
+					elgg_view_friendly_time($time_updated),
 					"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 	) . "</p>";
 }
diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
index cc3113b4e..5702ec415 100644
--- a/mod/pages/views/default/pages/pageprofile.php
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -63,7 +63,7 @@ if ($rev) {
 			$owner = get_entity($owner_guid);
 
 			echo sprintf(elgg_echo("pages:strapline"),
-							friendly_time($time_updated),
+							elgg_view_friendly_time($time_updated),
 							"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 			);
 
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);