Merged r6586:6587 from 1.7 branch into trunk

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

5 files changed, 6 insertions, 6 deletions

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 6b9f500a2..a30bf633b 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -178,7 +178,7 @@ function blog_url_handler($entity) {
 		return FALSE;
 	}
 
-	$friendly_title = friendly_title($entity->title);
+	$friendly_title = elgg_get_friendly_title($entity->title);
 
 	$url = "{$CONFIG->site->url}pg/blog/{$user->username}/read/{$entity->getGUID()}/$friendly_title";
 	return $url;
diff --git a/mod/blog/views/default/blog/sidebar_edit.php b/mod/blog/views/default/blog/sidebar_edit.php
index d75c28aad..6d75b85a0 100644
--- a/mod/blog/views/default/blog/sidebar_edit.php
+++ b/mod/blog/views/default/blog/sidebar_edit.php
@@ -34,7 +34,7 @@ if ($revisions) {
 	$load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
 
 	foreach ($revisions as $revision) {
-		$time = friendly_time($revision->time_created);
+		$time = elgg_view_friendly_time($revision->time_created);
 		$load = elgg_view('output/url', array(
 			'href' => $load_base_url . $revision->id,
 			'text' => elgg_echo('load')
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index 3481e444d..618f7d26a 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -44,7 +44,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 				'text' => elgg_echo('blog:status:published')
 			));
 
-			$time = "<span class='entity_subtext'>".friendly_time($blog->publish_date)."</span>";
+			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
 
 			echo '<li>
 			' . $load . ": $time
@@ -52,7 +52,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		}
 
 		foreach ($revisions as $revision) {
-			$time = "<span class='entity_subtext'>".friendly_time($revision->time_created)."</span>";
+			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
 			if ($revision->name == 'blog_auto_save') {
 				$revision_lang = elgg_echo('blog:auto_saved_revision');
 			} else {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 5f238cdc1..91a81ae53 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -31,7 +31,7 @@ if($blog->tags){
 }else{
 	$tags = "";
 }
-$date = friendly_time($blog->publish_date);
+$date = elgg_view_friendly_time($blog->publish_date);
 
 // The "on" status changes for comments, so best to check for !Off
 if ($blog->comments_on != 'Off') {
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index eadd4381d..3a521894f 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -10,7 +10,7 @@ $contents = strip_tags($object->excerpt);
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $title = sprintf(elgg_echo('blog:river:create'), $url);
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . friendly_time($object->time_created);
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
 
 if (isloggedin()) {
 	$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';