From f5f165a3532057d8a2a9016af404bd84f8da730a Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 10 Jun 2010 14:27:41 +0000
Subject: Moved view extend call - so it's for all users (not just object
 owner), and added likes to bookmarks (as we already have it in the activity
 stream)

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

(limited to 'mod/bookmarks/views')

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index fbb00e545..23aad799c 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -58,15 +58,18 @@ $delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array
 				)) . "</span>";
 }
 
-	$info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span>";
+$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>";
-	// include a view for plugins to extend
-	$info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
 	$info .= $delete;  
 }
+
 	$info .= "</div>";
 
 $info .= "<p class='entity_title'><a href=\"{$vars['entity']->address}\" target=\"_blank\">{$vars['entity']->title}</a></p>";
-- 
cgit v1.2.3