aboutsummaryrefslogtreecommitdiff
path: root/mod/blog/views/default
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/blog/views/default
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/blog/views/default')
-rw-r--r--mod/blog/views/default/blog/sidebar_edit.php2
-rw-r--r--mod/blog/views/default/blog/sidebar_revisions.php4
-rw-r--r--mod/blog/views/default/object/blog.php2
-rw-r--r--mod/blog/views/default/river/object/blog/create.php2
4 files changed, 5 insertions, 5 deletions
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>';