summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-24 13:57:20 -0700
committerBrion Vibber <brion@pobox.com>2010-03-24 13:57:20 -0700
commitecb009bcf5a6893b90d153be18c423dd7377796d (patch)
treea49b25af801b21aac04b62779d627221514dbb43 /lib
parent9fe12be41eec8132fcfa6da2dc5fad926a932286 (diff)
parenta954fd65ba00328cd1a76e620113d2f639340aaf (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/apiaction.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php
index e6aaf9316..9fc1a0779 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -1273,7 +1273,7 @@ class ApiAction extends Action
if (empty($local)) {
return null;
} else {
- return User_group::staticGet('id', $local->id);
+ return User_group::staticGet('id', $local->group_id);
}
}