diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
commit | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (patch) | |
tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /plugins/OStatus/actions | |
parent | 8629664ed90ffb496f607d15491821217f6b3126 (diff) | |
parent | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 2 | ||||
-rw-r--r-- | plugins/OStatus/actions/pushhub.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index f45e6a8d1..e318701a2 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -112,7 +112,7 @@ class OStatusSubAction extends Action $this->submit('submit', _m('Join'), 'submit', null, _m('Join this group')); } else { - $this->submit('submit', _m('Subscribe'), 'submit', null, + $this->submit('submit', _m('Confirm'), 'submit', null, _m('Subscribe to this user')); } $this->elementEnd('fieldset'); diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php index f33690bc4..842d65e7d 100644 --- a/plugins/OStatus/actions/pushhub.php +++ b/plugins/OStatus/actions/pushhub.php @@ -104,7 +104,7 @@ class PushHubAction extends Action throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes."); } - $sub = HubSub::staticGet($sub->topic, $sub->callback); + $sub = HubSub::staticGet($topic, $callback); if (!$sub) { // Creating a new one! $sub = new HubSub(); |