summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-26 09:35:08 -0800
committerBrion Vibber <brion@pobox.com>2010-02-26 09:35:08 -0800
commitb331e971b055386a126aaec27d661f26ba3b813c (patch)
tree2104caeb4ef8b80d08490b598e73148e2883a637 /lib
parentd9d1a77bb02227e6e79392959643404391df2ea0 (diff)
parent6ae39da198e391f57a901e24a2561e76afe11613 (diff)
Merge branch 'master' 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);
}
}
}