Merge branch 'profile' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / lib / hubprepqueuehandler.php

diff --git a/plugins/OStatus/lib/hubprepqueuehandler.php b/plugins/OStatus/lib/hubprepqueuehandler.php
index 0ed6a3ec57ac686eb4b663d001c132d3c67e7a45..f11ca42e62d56ff8dfdf04b01826738dc28a410a 100644 (file)
--- a/plugins/OStatus/lib/hubprepqueuehandler.php
+++ b/plugins/OStatus/lib/hubprepqueuehandler.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * When we have a large batch of PuSH consumers, we break the data set
+ * When we have a large batch of WebSub consumers, we break the data set
  * into smaller chunks. Enqueue final destinations...
  *
  * @package Hub
@@ -65,16 +65,16 @@ class HubPrepQueueHandler extends QueueHandler
             while (count($pushCallbacks) && $n < self::ROLLING_BATCH) {
                 $n++;
                 $callback = array_shift($pushCallbacks);
-                $sub = HubSub::staticGet($topic, $callback);
+                $sub = HubSub::getByHashkey($topic, $callback);
                 if (!$sub) {
-                    common_log(LOG_ERR, "Skipping PuSH delivery for deleted(?) consumer $callback on $topic");
+                    common_log(LOG_ERR, "Skipping WebSub delivery for deleted(?) consumer $callback on $topic");
                     continue;
                 }
 
                 $sub->distribute($atom);
             }
         } catch (Exception $e) {
-            common_log(LOG_ERR, "Exception during PuSH batch out: " .
+            common_log(LOG_ERR, "Exception during WebSub batch out: " .
                                 $e->getMessage() .
                                 " prepping $topic to $callback");
         }