From 33af29b47cb4009dc89b5431597bfda14dccfe65 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 19:22:22 +0000
Subject: [PATCH] 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.

---
 lib/profilelist.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 4f1e84a6af..d970e605ad 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');
         }