isSubscribed and hasBlocked need instance of Profile, not User

[quix0rs-gnu-social.git] / lib / apiaction.php

diff --git a/lib/apiaction.php b/lib/apiaction.php
old mode 100644 (file)
new mode 100755 (executable)
index d945d53..4b4c94a
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -127,6 +127,7 @@ class ApiAction extends Action
     var $since_id  = null;
     var $source    = null;
     var $callback  = null;
+    var $format    = null;
 
     var $access    = self::READ_ONLY;  // read (default) or read-write
 
@@ -579,13 +580,16 @@ class ApiAction extends Action
     {
         $details = array();
 
+               $source_profile = $source->getProfile();
+               $target_profile = $target->getProfile();                
+
         $details['screen_name'] = $source->nickname;
-        $details['followed_by'] = $target->isSubscribed($source);
-        $details['following'] = $source->isSubscribed($target);
+        $details['followed_by'] = $target->isSubscribed($source_profile);
+        $details['following'] = $source->isSubscribed($target_profile);
 
         $notifications = false;
 
-        if ($source->isSubscribed($target)) {
+        if ($source->isSubscribed($target_profile)) {
             $sub = Subscription::pkeyGet(array('subscriber' =>
                 $source->id, 'subscribed' => $target->id));
 
@@ -595,7 +599,7 @@ class ApiAction extends Action
         }
 
         $details['notifications_enabled'] = $notifications;
-        $details['blocking'] = $source->hasBlocked($target);
+        $details['blocking'] = $source->hasBlocked($target_profile);
         $details['id'] = intval($source->id);
 
         return $details;