diff options
Diffstat (limited to 'mod/bookmarks/views')
4 files changed, 9 insertions, 9 deletions
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php index b9c9d27a8..652743b7b 100755 --- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php +++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php @@ -15,7 +15,7 @@ if($bookmarks){ $owner = $b->getOwnerEntity(); //get the time - $friendlytime = friendly_time($b->time_created); + $friendlytime = elgg_view_friendly_time($b->time_created); $info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>"; diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 23aad799c..67ba1bd91 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -1,7 +1,7 @@ <?php /** * Elgg bookmark view - * + * * @package ElggBookmarks * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 * @author Curverider <info@elgg.com> @@ -10,7 +10,7 @@ */ $owner = $vars['entity']->getOwnerEntity(); -$friendlytime = friendly_time($vars['entity']->time_created); +$friendlytime = elgg_view_friendly_time($vars['entity']->time_created); $parsed_url = parse_url($vars['entity']->address); $faviconurl = $parsed_url['scheme'] . "://" . $parsed_url['host'] . "/favicon.ico"; @@ -51,7 +51,7 @@ if (@file_exists($faviconurl)) { //delete if($vars['entity']->canEdit()){ -$delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array( +$delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array( 'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid, 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("bookmarks:delete:confirm"), @@ -63,11 +63,11 @@ $info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span> // include a view for plugins to extend $info .= elgg_view("bookmarks/options",array('entity' => $vars['entity'])); $info .= elgg_view_likes($vars['entity']); // include likes - + //include edit and delete options if($vars['entity']->canEdit()){ $info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>"; - $info .= $delete; + $info .= $delete; } $info .= "</div>"; @@ -82,6 +82,6 @@ if (!empty($tags)) { if($view_notes != ''){ $info .= "<div class='note hidden'>". $vars['entity']->description . "</div>"; } - + //display echo elgg_view_listing($icon, $info);
\ No newline at end of file diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php index 2e27961c0..dec4ab4d1 100644 --- a/mod/bookmarks/views/default/river/object/bookmarks/create.php +++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php @@ -13,7 +13,7 @@ $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>"; if(($is_group instanceof ElggGroup) && (get_context() != 'groups')){ $string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>"; } -$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created); +$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created); if (isloggedin()){ $string .= "<a class='river_comment_form_button link'>Comment</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php index 4240b95f0..e3ae74681 100644 --- a/mod/bookmarks/views/default/widgets/bookmarks/view.php +++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php @@ -27,7 +27,7 @@ if($bookmarks){ $owner = $b->getOwnerEntity(); //get the time - $friendlytime = friendly_time($b->time_created); + $friendlytime = elgg_view_friendly_time($s->time_created); //get the bookmark title $info = "<div class='river_object_bookmarks_create'><p class=\"shares_title\"><a href=\"{$b->address}\">{$b->title}</a></p></div>"; |