diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-21 23:58:35 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-21 23:58:35 +0000 |
| commit | 8a73785aee3e51c26c65053a4de7c5d7f0ebb673 (patch) | |
| tree | 41e7e607886b0498a0d8d4dc79df6aaa5094d385 /mod/blog/views/default/blog | |
| parent | b81f168b0bfc298c6eb1c0a2a857311f076c40bd (diff) | |
| download | elgg-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/blog')
| -rw-r--r-- | mod/blog/views/default/blog/sidebar_edit.php | 2 | ||||
| -rw-r--r-- | mod/blog/views/default/blog/sidebar_revisions.php | 4 |
2 files changed, 3 insertions, 3 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 { |