diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-04 10:16:59 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-04 10:16:59 -0800 |
commit | f969d6349c244e2ec32c3ebe7eb355426006f4db (patch) | |
tree | b66cd619681ffd868178ae3d4b8f6103adcc036e /plugins/OStatus/actions | |
parent | b218aee94e581230e1efa14d4ae1a19756986ddf (diff) | |
parent | b720c7554be2a8e15c3772fe1071c48cf91935d6 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
db/08to09.sql
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r-- | plugins/OStatus/actions/ostatusinit.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index 1e45025b0..22aea9f70 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -186,7 +186,7 @@ class OStatusInitAction extends Action $this->clientError("No such user."); } } else if ($this->group) { - $group = Local_group::staticGet('id', $this->group); + $group = Local_group::staticGet('nickname', $this->group); if ($group) { return common_local_url('groupbyid', array('id' => $group->group_id)); } else { |