aboutsummaryrefslogtreecommitdiff
path: root/mod/groups/lib
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-09-29 18:16:03 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-09-29 18:16:03 -0700
commitbfdb9bb8a87a29038ba1ae25355684ae19678fdd (patch)
treea074e2d6bfa19c17b284c3950b4555cf584eabe2 /mod/groups/lib
parent7be23080f34a8f92ca1f8d49c3aa0e6ce3472f4c (diff)
parenta458ae4e0f8e5b19884860fead6e5f901b95eca4 (diff)
downloadelgg-bfdb9bb8a87a29038ba1ae25355684ae19678fdd.tar.gz
elgg-bfdb9bb8a87a29038ba1ae25355684ae19678fdd.tar.bz2
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'mod/groups/lib')
-rw-r--r--mod/groups/lib/groups.php6
1 files changed, 3 insertions, 3 deletions
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(