eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Quick fixes for grouplistall:

Browse Source 
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
This commit is contained in:
Brion Vibber 2010-03-30 11:07:01 -07:00
parent 17f1ea703d
commit ca897ef346
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/apigrouplistall.php
View File

@ -66,7 +66,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
{ {
parent::prepare($args); parent::prepare($args);
$this->user = $this->getTargetUser($id); $this->user = $this->getTargetUser(null);
$this->groups = $this->getGroups(); $this->groups = $this->getGroups();
return true; return true;
@ -137,11 +137,18 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
$qry = 'SELECT user_group.* '. $qry = 'SELECT user_group.* '.
'from user_group join local_group on user_group.id = local_group.group_id '. 'from user_group join local_group on user_group.id = local_group.group_id '.
'order by created desc '; 'order by created desc ';
$offset = intval($this->page - 1) * intval($this->count);
$limit = intval($this->count);
if (common_config('db', 'type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
$group = new User_group(); $group = new User_group();
$group->query($qry); $group->query($qry);
$groups = array();
while ($group->fetch()) { while ($group->fetch()) {
$groups[] = clone($group); $groups[] = clone($group);
} }

1
lib/apiaction.php
View File

@ -318,7 +318,6 @@ class ApiAction extends Action
$twitter_group['url']=$group->permalink(); $twitter_group['url']=$group->permalink();
$twitter_group['nickname']=$group->nickname; $twitter_group['nickname']=$group->nickname;
$twitter_group['fullname']=$group->fullname; $twitter_group['fullname']=$group->fullname;
$twitter_group['homepage_url']=$group->homepage_url;
$twitter_group['original_logo']=$group->original_logo; $twitter_group['original_logo']=$group->original_logo;
$twitter_group['homepage_logo']=$group->homepage_logo; $twitter_group['homepage_logo']=$group->homepage_logo;
$twitter_group['stream_logo']=$group->stream_logo; $twitter_group['stream_logo']=$group->stream_logo;