diff options
author | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
---|---|---|
committer | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
commit | 7c8031dc4bf6ece83db893e13d89ced10c2f6b62 (patch) | |
tree | 9b48e3d511642450ac0566b00cfb6f2d8ae109aa /actions/subscribe.php | |
parent | 855692141d531287b179841b8816e90023b6ba7b (diff) | |
parent | 02300ebfb08bfcd52f4ab34d1041455079ebf2ec (diff) |
Merge remote branch 'statusnet/testing' into testing
Conflicts:
plugins/OStatus/lib/webfinger.php
Diffstat (limited to 'actions/subscribe.php')
-rw-r--r-- | actions/subscribe.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php index 3745311b6..b1243f393 100644 --- a/actions/subscribe.php +++ b/actions/subscribe.php @@ -145,7 +145,7 @@ class SubscribeAction extends Action $this->element('title', null, _('Subscribed')); $this->elementEnd('head'); $this->elementStart('body'); - $unsubscribe = new UnsubscribeForm($this, $this->other->getProfile()); + $unsubscribe = new UnsubscribeForm($this, $this->other); $unsubscribe->show(); $this->elementEnd('body'); $this->elementEnd('html'); |