summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-03-06 13:35:10 -0800
committerZach Copley <zach@controlyourself.ca>2009-03-06 13:35:10 -0800
commit0617c7b7730e4e42cd6285737f9fe999688fbdc6 (patch)
tree1c71106b8c9d1dd79a2517a677ba92a9a7bd5bc1
parentb1f337fe018dd3910c68589a98b0242470743a4c (diff)
parent896f0340bf3710b79b117236e940b487a4b56460 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
-rw-r--r--lib/groupsbymemberssection.php4
-rw-r--r--lib/groupsbypostssection.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 5f26c6626..963e21f15 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -45,10 +45,10 @@ class GroupsByMembersSection extends GroupSection
{
function getGroups()
{
- $qry = 'SELECT user_group.id, count(*) as value ' .
+ $qry = 'SELECT user_group.*, count(*) as value ' .
'FROM user_group JOIN group_member '.
'ON user_group.id = group_member.group_id ' .
- 'GROUP BY user_group.id ' .
+ 'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
'ORDER BY value DESC ';
$limit = GROUPS_PER_SECTION;
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index 1a60ddb4f..325b4033f 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -45,10 +45,10 @@ class GroupsByPostsSection extends GroupSection
{
function getGroups()
{
- $qry = 'SELECT user_group.id, count(*) as value ' .
+ $qry = 'SELECT user_group.*, count(*) as value ' .
'FROM user_group JOIN group_inbox '.
'ON user_group.id = group_inbox.group_id ' .
- 'GROUP BY user_group.id ' .
+ 'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
'ORDER BY value DESC ';
$limit = GROUPS_PER_SECTION;