GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix fatal error on OMB subscription for first-timers

This commit is contained in:
Brion Vibber 2009-11-25 12:07:19 -08:00
parent 71d5990ea3
commit f1b64c4db5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actions/finishremotesubscribe.php
View File

@ -89,12 +89,16 @@ class FinishremotesubscribeAction extends Action
} }
$remote = Remote_profile::staticGet('uri', $service->getListenerURI()); $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)) { if ($user->hasBlocked($profile)) {
$this->clientError(_('That user has blocked you from subscribing.')); $this->clientError(_('That user has blocked you from subscribing.'));
return; return;
}
} }
/* Perform the handling itself via libomb. */ /* 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 /* The service URLs are not accessible from datastore, so setting them
after insertion of the profile. */ after insertion of the profile. */
$remote = Remote_profile::staticGet('uri', $service->getListenerURI());
$orig_remote = clone($remote); $orig_remote = clone($remote);
$remote->postnoticeurl = $remote->postnoticeurl =