summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-03 19:22:22 +0000
committerBrion Vibber <brion@pobox.com>2010-03-03 19:22:22 +0000
commit33af29b47cb4009dc89b5431597bfda14dccfe65 (patch)
treef1b6c51522506eab92d3684375465060f44c40fa /lib
parent3bb42d117027ebf610481ca3b0733854e0127e56 (diff)
Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there.
Diffstat (limited to 'lib')
-rw-r--r--lib/profilelist.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 4f1e84a6a..d970e605a 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -273,18 +273,12 @@ class ProfileListItem extends Widget
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
- $other = User::staticGet('id', $this->profile->id);
- if (!empty($other)) {
+ // We can't initiate sub for a remote OMB profile.
+ $remote = Remote_profile::staticGet('id', $this->profile->id);
+ if (empty($remote)) {
$sf = new SubscribeForm($this->out, $this->profile);
$sf->show();
}
- else {
- $url = common_local_url('remotesubscribe',
- array('nickname' => $this->profile->nickname));
- $this->out->element('a', array('href' => $url,
- 'class' => 'entity_remote_subscribe'),
- _('Subscribe'));
- }
}
$this->out->elementEnd('li');
}