Merge branch 'master' into social-master

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

diff --git a/classes/Subscription.php b/classes/Subscription.php
index 12f4e86f10bf3009ee93a3f9af0bbf6dfcecf1ae..4d7eb524dcf8d89da61e4ba15d9a2bac39d7b7cc 100644 (file)
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -124,7 +124,9 @@ class Subscription extends Managed_DataObject
                 }
             }
 
-            Event::handle('EndSubscribe', array($subscriber, $other));
+            if ($sub instanceof Subscription) { // i.e. not SubscriptionQueue
+                Event::handle('EndSubscribe', array($subscriber, $other));
+            }
         }
 
         return $sub;
@@ -265,8 +267,8 @@ class Subscription extends Managed_DataObject
                                $subscriber->getBestName(),
                                $subscribed->getBestName());
 
-        $act->actor     = ActivityObject::fromProfile($subscriber);
-        $act->objects[] = ActivityObject::fromProfile($subscribed);
+        $act->actor     = $subscriber->asActivityObject();
+        $act->objects[] = $subscribed->asActivityObject();
 
         $url = common_local_url('AtomPubShowSubscription',
                                 array('subscriber' => $subscriber->id,
@@ -373,7 +375,7 @@ class Subscription extends Managed_DataObject
         $ids = $sub->fetchAll($get_type);
 
         // If we're simultaneously filling up cache, remember to slice
-        if ($offset === 0 && $querylimit === self::CACHE_WINDOW) {
+        if ($queryoffset === 0 && $querylimit === self::CACHE_WINDOW) {
             self::cacheSet($cacheKey, $ids);
             return array_slice($ids, $offset, $limit);
         }