Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / classes / Subscription_queue.php

diff --git a/classes/Subscription_queue.php b/classes/Subscription_queue.php
index 878fcf5796968028b7464b441a00aeb9e1eaf2a2..a60293e2158e9bf8b42ff6f01ff079b1a9056c1b 100644 (file)
--- a/classes/Subscription_queue.php
+++ b/classes/Subscription_queue.php
@@ -47,10 +47,10 @@ class Subscription_queue extends Managed_DataObject
         return $rq;
     }
 
-    public function exists(Profile $subscriber, Profile $other)
+    static function exists(Profile $subscriber, Profile $other)
     {
-        $sub = Subscription_queue::pkeyGet(array('subscriber' => $subscriber->id,
-                                                 'subscribed' => $other->id));
+        $sub = Subscription_queue::pkeyGet(array('subscriber' => $subscriber->getID(),
+                                                 'subscribed' => $other->getID()));
         return ($sub instanceof Subscription_queue);
     }