diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-03 11:42:02 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-03 11:42:02 -0800 |
commit | 13521cb510f2377e9b865b0506f92ada9ef9b3cd (patch) | |
tree | 253eb64f09ecc821ba273cee88514775495b5f97 /classes/User.php | |
parent | e793b5661c2344371a14dfb87b0302a95da5ea48 (diff) | |
parent | ccd0db1e0a928fe914c894966ecf2260964a68f0 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/classes/User.php b/classes/User.php index 57d76731b..aa9fbf948 100644 --- a/classes/User.php +++ b/classes/User.php @@ -612,28 +612,8 @@ class User extends Memcached_DataObject function getGroups($offset=0, $limit=null) { - $qry = - 'SELECT user_group.* ' . - 'FROM user_group JOIN group_member '. - 'ON user_group.id = group_member.group_id ' . - 'WHERE group_member.profile_id = %d ' . - 'ORDER BY group_member.created DESC '; - - if ($offset>0 && !is_null($limit)) { - if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } - } - } - - $groups = new User_group(); - - $cnt = $groups->query(sprintf($qry, $this->id)); - - return $groups; + $profile = $this->getProfile(); + return $profile->getGroups($offset, $limit); } function getSubscriptions($offset=0, $limit=null) |