Subscription class gets exception throwing getSubscription function

diff --git a/classes/Subscription.php b/classes/Subscription.php
index 4d7eb524dcf8d89da61e4ba15d9a2bac39d7b7cc..cd9ae3cce519ec0ab6079747c305cd5bf230ba73 100644 (file)
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -232,9 +232,25 @@ class Subscription extends Managed_DataObject
 
     static function exists(Profile $subscriber, Profile $other)
     {
-        $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
-                                           'subscribed' => $other->id));
-        return ($sub instanceof Subscription);
+        try {
+            $sub = self::getSubscription($subscriber, $other);
+        } catch (NoResultException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    static function getSubscription(Profile $subscriber, Profile $other)
+    {
+        // This is essentially a pkeyGet but we have an object to return in NoResultException
+        $sub = new Subscription();
+        $sub->subscriber = $subscriber->id;
+        $sub->subscribed = $other->id;
+        if (!$sub->find(true)) {
+            throw new NoResultException($sub);
+        }
+        return $sub;
     }
 
     function asActivity()