diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-03 11:42:02 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-03 11:42:02 -0800 |
commit | 13521cb510f2377e9b865b0506f92ada9ef9b3cd (patch) | |
tree | 253eb64f09ecc821ba273cee88514775495b5f97 /lib/profilelist.php | |
parent | e793b5661c2344371a14dfb87b0302a95da5ea48 (diff) | |
parent | ccd0db1e0a928fe914c894966ecf2260964a68f0 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/profilelist.php')
-rw-r--r-- | lib/profilelist.php | 12 |
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'); } |