Merge branch 'master' into mmn_fixes

[quix0rs-gnu-social.git] / plugins / FeedPoller / FeedPollerPlugin.php

diff --git a/plugins/FeedPoller/FeedPollerPlugin.php b/plugins/FeedPoller/FeedPollerPlugin.php
index c844d99c1bd95f53878a1867e3bb91b9319de609..2326cd2f1b4d6bd1225cf77f832891e2ce307157 100644 (file)
--- a/plugins/FeedPoller/FeedPollerPlugin.php
+++ b/plugins/FeedPoller/FeedPollerPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * GNU social feed polling plugin, to avoid using external PuSH hubs
+ * GNU social feed polling plugin, to avoid using external WebSub hubs
  *
  * @category  Feed
  * @package   GNUsocial
@@ -30,7 +30,7 @@ class FeedPollerPlugin extends Plugin {
 
     public function onFeedSubscribe(FeedSub $feedsub)
     {
-        if (!$feedsub->isPuSH()) {
+        if (!$feedsub->isWebSub()) {
             FeedPoll::setupFeedSub($feedsub, $this->interval*60);
             return false;   // We're polling this feed, so stop processing FeedSubscribe
         }
@@ -39,7 +39,7 @@ class FeedPollerPlugin extends Plugin {
 
     public function onFeedUnsubscribe(FeedSub $feedsub)
     {
-        if (!$feedsub->isPuSH()) {
+        if (!$feedsub->isWebSub()) {
             // removes sub_state setting and such
             $feedsub->confirmUnsubscribe();
             return false;
@@ -47,7 +47,7 @@ class FeedPollerPlugin extends Plugin {
         return true;
     }
 
-    public function onPluginVersion(&$versions)
+    public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FeedPoller',
                             'version' => GNUSOCIAL_VERSION,