1 files changed, 75 insertions, 26 deletions

diff --git a/mod/groups/start.php b/mod/groups/start.php
index d85bb6492..6002a535c 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -141,35 +141,63 @@ function groups_setup_sidebar_menus() {
 	// Get the page owner entity
 	$page_owner = elgg_get_page_owner_entity();
 
-	if (elgg_get_context() == 'groups') {
-		if ($page_owner instanceof ElggGroup) {
-			if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
-				$url = elgg_get_site_url() . "groups/requests/{$page_owner->getGUID()}";
-				elgg_register_menu_item('page', array(
-					'name' => 'membership_requests',
-					'text' => elgg_echo('groups:membershiprequests'),
-					'href' => $url,
-				));
+	if (elgg_in_context('group_profile')) {
+		if (!elgg_instanceof($page_owner, 'group')) {
+			forward('', '404');
+		}
+
+		if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
+			$url = elgg_get_site_url() . "groups/requests/{$page_owner->getGUID()}";
+
+			$count = elgg_get_entities_from_relationship(array(
+				'type' => 'user',
+				'relationship' => 'membership_request',
+				'relationship_guid' => $page_owner->getGUID(),
+				'inverse_relationship' => true,
+				'count' => true,
+			));
+
+			if ($count) {
+				$text = elgg_echo('groups:membershiprequests:pending', array($count));
+			} else {
+				$text = elgg_echo('groups:membershiprequests');
 			}
-		} else {
+
 			elgg_register_menu_item('page', array(
-				'name' => 'groups:all',
-				'text' => elgg_echo('groups:all'),
-				'href' => 'groups/all',
+				'name' => 'membership_requests',
+				'text' => $text,
+				'href' => $url,
 			));
+		}
+	}
+	if (elgg_get_context() == 'groups' && !elgg_instanceof($page_owner, 'group')) {
+		elgg_register_menu_item('page', array(
+			'name' => 'groups:all',
+			'text' => elgg_echo('groups:all'),
+			'href' => 'groups/all',
+		));
 
-			$user = elgg_get_logged_in_user_entity();
-			if ($user) {
-				$url =  "groups/owner/$user->username";
-				$item = new ElggMenuItem('groups:owned', elgg_echo('groups:owned'), $url);
-				elgg_register_menu_item('page', $item);
-				$url = "groups/member/$user->username";
-				$item = new ElggMenuItem('groups:member', elgg_echo('groups:yours'), $url);
-				elgg_register_menu_item('page', $item);
-				$url = "groups/invitations/$user->username";
-				$item = new ElggMenuItem('groups:user:invites', elgg_echo('groups:invitations'), $url);
-				elgg_register_menu_item('page', $item);
+		$user = elgg_get_logged_in_user_entity();
+		if ($user) {
+			$url =  "groups/owner/$user->username";
+			$item = new ElggMenuItem('groups:owned', elgg_echo('groups:owned'), $url);
+			elgg_register_menu_item('page', $item);
+			
+			$url = "groups/member/$user->username";
+			$item = new ElggMenuItem('groups:member', elgg_echo('groups:yours'), $url);
+			elgg_register_menu_item('page', $item);
+
+			$url = "groups/invitations/$user->username";
+			$invitations = groups_get_invited_groups($user->getGUID());
+			if (is_array($invitations) && !empty($invitations)) {
+				$invitation_count = count($invitations);
+				$text = elgg_echo('groups:invitations:pending', array($invitation_count));
+			} else {
+				$text = elgg_echo('groups:invitations');
 			}
+
+			$item = new ElggMenuItem('groups:user:invites', $text, $url);
+			elgg_register_menu_item('page', $item);
 		}
 	}
 }
@@ -195,8 +223,21 @@ function groups_setup_sidebar_menus() {
  */
 function groups_page_handler($page) {
 
+	// forward old profile urls
+	if (is_numeric($page[0])) {
+		$group = get_entity($page[0]);
+		if (elgg_instanceof($group, 'group', '', 'ElggGroup')) {
+			system_message(elgg_echo('changebookmark'));
+			forward($group->getURL());
+		}
+	}
+	
 	elgg_load_library('elgg:groups');
 
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
 	elgg_push_breadcrumb(elgg_echo('groups'), "groups/all");
 
 	switch ($page[0]) {
@@ -535,7 +576,7 @@ function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params
 					'relationship' => 'member',
 					'relationship_guid' => $user_guid,
 					'inverse_relationship' => FALSE,
-					'limit' => 999
+					'limit' => false
 				));
 
 		if ($groups) {
@@ -786,6 +827,10 @@ function discussion_page_handler($page) {
 
 	elgg_load_library('elgg:discussion');
 
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
 	elgg_push_breadcrumb(elgg_echo('discussion'), 'discussion/all');
 
 	switch ($page[0]) {
@@ -943,6 +988,10 @@ function discussion_create_reply_notification($hook, $type, $message, $params) {
 function discussion_reply_notifications($event, $type, $annotation) {
 	global $CONFIG, $NOTIFICATION_HANDLERS;
 
+	if ($annotation->name !== 'group_topic_post') {
+		return;
+	}
+
 	// Have we registered notifications for this type of entity?
 	$object_type = 'object';
 	$object_subtype = 'groupforumtopic';
@@ -968,7 +1017,7 @@ function discussion_reply_notifications($event, $type, $annotation) {
 				'relationship' => 'notify' . $method,
 				'relationship_guid' => $topic->getContainerGUID(),
 				'inverse_relationship' => true,
-				'types' => 'user',
+				'type' => 'user',
 				'limit' => 0,
 			));