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 | |
| parent | b218aee94e581230e1efa14d4ae1a19756986ddf (diff) | |
| parent | b720c7554be2a8e15c3772fe1071c48cf91935d6 (diff) | |
Merge branch 'testing' into 0.9.x
Conflicts:
db/08to09.sql
Diffstat (limited to 'plugins/OStatus')
| -rw-r--r-- | plugins/OStatus/OStatusPlugin.php | 13 | ||||
| -rw-r--r-- | plugins/OStatus/actions/ostatusinit.php | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 033325c9e..efb630297 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -836,4 +836,17 @@ class OStatusPlugin extends Plugin return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'OStatus', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley', + 'homepage' => 'http://status.net/wiki/Plugin:OStatus', + 'rawdescription' => + _m('Follow people across social networks that implement '. + '<a href="http://ostatus.org/">OStatus</a>.')); + + return true; + } } 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 { |