summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
committerEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
commitfc576562a39943fb1fa83a6a6d1fdef4f234564a (patch)
tree9746f83e1f5b155cb7ebd07c4600428d37c18058 /lib
parent6781f95c733ed4d678fc4c09926efe195e590359 (diff)
parentb331e971b055386a126aaec27d661f26ba3b813c (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
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 d79dc327e..2af150ab9 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -1248,7 +1248,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);
}
}
}