We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 5d548d15 authored by mattl's avatar mattl

Merge branch 'master' into 'master'

block check can't be done inside the same try-expression as Subscription::getSub…

…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.

See merge request !59
parents dbdac9cf abb8d127
......@@ -274,11 +274,11 @@ class ApiAction extends Action
$sub = Subscription::getSubscription($this->scoped, $profile);
// Notifications on?
$twitter_user['following'] = true;
$twitter_user['statusnet_blocking'] = $this->scoped->hasBlocked($profile);
$twitter_user['notifications'] = ($sub->jabber || $sub->sms);
} catch (NoResultException $e) {
// well, the values are already false...
$twitter_user['statusnet_blocking'] = $this->scoped->hasBlocked($profile);
if ($get_notice) {
......@@ -1550,4 +1550,4 @@ class ApiAction extends Action
return $uri;
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment