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/embed/views/default | |
| 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/embed/views/default')
| -rw-r--r-- | mod/embed/views/default/embed/item/list.php | 2 | ||||
| -rw-r--r-- | mod/embed/views/default/object/file/embedlist.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php index 258e01aed..c45b42e19 100644 --- a/mod/embed/views/default/embed/item/list.php +++ b/mod/embed/views/default/embed/item/list.php @@ -42,7 +42,7 @@ if ($ecml_keyword) { $icon = "<img src=\"{$item->getIcon($icon_size)}\" />"; $info = "<p class='entity_title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>"; -$info .= "<p class='entity_subtext'>" . friendly_time($vars['item']->time_created) . "</p>"; +$info .= "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>"; // @todo is this approach better than inline js? echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>'; diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php index 345e69b4b..1f287b938 100644 --- a/mod/embed/views/default/object/file/embedlist.php +++ b/mod/embed/views/default/object/file/embedlist.php @@ -1,6 +1,6 @@ <?php $file = $vars['entity']; - $friendlytime = friendly_time($vars['entity']->time_created); + $friendlytime = elgg_view_friendly_time($vars['entity']->time_created); $info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>"; $info .= "<p class='entity_subtext'>{$friendlytime}"; |