eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

isSubscribed and hasBlocked need instance of Profile, not User

Browse Source 
used by actions/apifriendshipsshow.php
This commit is contained in:
Hannes Mannerheim 2014-10-20 16:10:11 +02:00
parent bf94154c96
commit 852924799f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/apiaction.php Normal file → Executable file
View File

@ -580,13 +580,16 @@ class ApiAction extends Action
{ {
$details = array(); $details = array();
$source_profile = $source->getProfile();
$target_profile = $target->getProfile();
$details['screen_name'] = $source->nickname; $details['screen_name'] = $source->nickname;
$details['followed_by'] = $target->isSubscribed($source); $details['followed_by'] = $target->isSubscribed($source_profile);
$details['following'] = $source->isSubscribed($target); $details['following'] = $source->isSubscribed($target_profile);
$notifications = false; $notifications = false;
if ($source->isSubscribed($target)) { if ($source->isSubscribed($target_profile)) {
$sub = Subscription::pkeyGet(array('subscriber' => $sub = Subscription::pkeyGet(array('subscriber' =>
$source->id, 'subscribed' => $target->id)); $source->id, 'subscribed' => $target->id));
@ -596,7 +599,7 @@ class ApiAction extends Action
} }
$details['notifications_enabled'] = $notifications; $details['notifications_enabled'] = $notifications;
$details['blocking'] = $source->hasBlocked($target); $details['blocking'] = $source->hasBlocked($target_profile);
$details['id'] = intval($source->id); $details['id'] = intval($source->id);
return $details; return $details;