Merge branch 'direct-feed-sub' into 'master'

[quix0rs-gnu-social.git] / actions / atompubshowsubscription.php

diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index 0d8c3615196186ee5ac241207d79e3487bdd6d51..ee5a477d49eca4a75d04264b8137f8dd4c33260e 100644 (file)
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -70,7 +70,9 @@ class AtompubshowsubscriptionAction extends AtompubAction
                                               $subscribedId), 404);
         }
 
-        if (!$this->_subscriber->isSubscribed($this->_subscribed)) {
+        $this->_subscription = Subscription::pkeyGet(array('subscriber' => $subscriberId,
+                                                           'subscribed' => $subscribedId));
+        if (!$this->_subscription instanceof Subscription) {
             // TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
             // TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
             $msg = sprintf(_('Profile %1$d not subscribed to profile %2$d.'),