From 8a73785aee3e51c26c65053a4de7c5d7f0ebb673 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 21 Aug 2010 23:58:35 +0000
Subject: Merged r6586:6587 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/views/default/object/bookmarks.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mod/bookmarks/views/default/object/bookmarks.php')

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
-- 
cgit v1.2.3