improved menu creation for on demand menus and integrated hover menu items into profile owner block

git-svn-id: http://code.elgg.org/elgg/trunk@7724 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 9 insertions, 5 deletions

diff --git a/mod/messages/start.php b/mod/messages/start.php
index 861f219b2..e8f5105b2 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -311,12 +311,16 @@ function messages_site_notify_handler(ElggEntity $from, ElggUser $to, $subject,
  * Add to the user hover menu
  */
 function messages_user_hover_menu($hook, $type, $return, $params) {
-	$user = $params['user'];
+	$user = $params['entity'];
 
-	$url = "mod/messages/send.php?send_to={$user->guid}";
-	$item = new ElggMenuItem('logbrowser', elgg_echo('messages:sendmessage'), $url);
-	$item->setSection('action');
-	elgg_register_menu_item('user_hover', $item);
+	if (isloggedin() && get_loggedin_userid() != $user->guid) {
+		$url = "mod/messages/send.php?send_to={$user->guid}";
+		$item = new ElggMenuItem('send', elgg_echo('messages:sendmessage'), $url);
+		$item->setSection('action');
+		$return[] = $item;
+	}
+
+	return $return;
 }