From: Brion Vibber <brion@pobox.com>
Date: Wed, 25 Nov 2009 20:07:19 +0000 (-0800)
Subject: Fix fatal error on OMB subscription for first-timers
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1b64c4db52d6881c845704bfde3e3514e3ebe8f;p=quix0rs-gnu-social.git

Fix fatal error on OMB subscription for first-timers
---

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index b1cec66f48..deee70f360 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -89,12 +89,16 @@ class FinishremotesubscribeAction extends Action
         }
 
         $remote = Remote_profile::staticGet('uri', $service->getListenerURI());
+        if ($remote) {
+            // Note remote profile may not have been saved yet.
+            // @fixme not convinced this is correct at all!
 
-        $profile = Profile::staticGet($remote->id);
+            $profile = Profile::staticGet($remote->id);
 
-        if ($user->hasBlocked($profile)) {
-            $this->clientError(_('That user has blocked you from subscribing.'));
-            return;
+            if ($user->hasBlocked($profile)) {
+                $this->clientError(_('That user has blocked you from subscribing.'));
+                return;
+            }
         }
 
         /* Perform the handling itself via libomb. */
@@ -122,6 +126,7 @@ class FinishremotesubscribeAction extends Action
 
         /* The service URLs are not accessible from datastore, so setting them
            after insertion of the profile. */
+        $remote = Remote_profile::staticGet('uri', $service->getListenerURI());
         $orig_remote = clone($remote);
 
         $remote->postnoticeurl    =