Merge branch 'master' of github.com:brettp/Elgg

6 files changed, 9 insertions, 7 deletions

diff --git a/mod/groups/actions/groups/membership/join.php b/mod/groups/actions/groups/membership/join.php
index 210e285a5..b4f4e280c 100644
--- a/mod/groups/actions/groups/membership/join.php
+++ b/mod/groups/actions/groups/membership/join.php
@@ -10,6 +10,8 @@
  * @package ElggGroups
  */
 
+global $CONFIG;
+
 $user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
@@ -45,7 +47,7 @@ if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) {
 		add_entity_relationship($user->guid, 'membership_request', $group->guid);
 
 		// Notify group owner
-		$url = "{$CONFIG->url}mod/groups/membershipreq.php?group_guid={$group->guid}";
+		$url = "{$CONFIG->url}groups/requests/$group->guid";
 		$subject = elgg_echo('groups:request:subject', array(
 			$user->name,
 			$group->name,
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 12a22deb4..86e6f018e 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -17,7 +17,7 @@ function groups_handle_all_page() {
 	$selected_tab = get_input('filter', 'newest');
 
 	switch ($selected_tab) {
-		case 'pop':
+		case 'popular':
 			$content = elgg_list_entities_from_relationship_count(array(
 				'type' => 'group',
 				'relationship' => 'member',
@@ -25,7 +25,7 @@ function groups_handle_all_page() {
 				'full_view' => false,
 			));
 			break;
-		case 'active':
+		case 'discussion':
 			$content = elgg_list_entities(array(
 				'type' => 'object',
 				'subtype' => 'groupforumtopic',
@@ -198,7 +198,7 @@ function groups_handle_invitations_page() {
 	elgg_push_breadcrumb($title);
 
 	// @todo temporary workaround for exts #287.
-	$invitations = groups_get_invited_groups($user->getGUID());
+	$invitations = groups_get_invited_groups(elgg_get_logged_in_user_guid());
 	$content = elgg_view('groups/invitationrequests', array('invitations' => $invitations));
 
 	$params = array(
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 788788324..9c2df8b9c 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -10,7 +10,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 	echo '<ul class="elgg-list">';
 	foreach ($vars['invitations'] as $group) {
 		if ($group instanceof ElggGroup) {
-			$icon = elgg_view_entity_icon($group, 'tiny', array('override' => 'true'));
+			$icon = elgg_view_entity_icon($group, 'tiny', array('hover' => 'true'));
 
 			$group_title = elgg_view('output/url', array(
 				'href' => $group->getURL(),
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 4d1c78c8c..7f33b83e0 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -11,7 +11,7 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
 	echo '<ul class="elgg-list">';
 	foreach ($vars['requests'] as $user) {
 		if ($user instanceof ElggUser) {
-			$icon = elgg_view_entity_icon($user, 'tiny', array('override' => 'true'));
+			$icon = elgg_view_entity_icon($user, 'tiny', array('hover' => 'true'));
 
 			$user_title = elgg_view('output/url', array(
 				'href' => $user->getURL(),
diff --git a/mod/groups/views/default/settings/groups/edit.php b/mod/groups/views/default/plugins/groups/settings.php
index 7197dcb37..7197dcb37 100644
--- a/mod/groups/views/default/settings/groups/edit.php
+++ b/mod/groups/views/default/plugins/groups/settings.php
diff --git a/mod/groups/views/default/widgets/a_users_groups/content.php b/mod/groups/views/default/widgets/a_users_groups/content.php
index 81d355442..114fd7565 100644
--- a/mod/groups/views/default/widgets/a_users_groups/content.php
+++ b/mod/groups/views/default/widgets/a_users_groups/content.php
@@ -21,7 +21,7 @@ $content = elgg_list_entities_from_relationship($options);
 echo $content;
 
 if ($content) {
-	$url = "group/member/" . elgg_get_page_owner_entity()->username;
+	$url = "groups/member/" . elgg_get_page_owner_entity()->username;
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('groups:more'),