The poller now always respects the priority setting for feeds.

diff --git a/include/poller.php b/include/poller.php
index 781d3ace30e6e02e0340d0fdcad90fffd1c27b79..1967d59c6e109ef937f2f195b0cca42e672a2283 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -230,8 +230,6 @@ function poller_run(&$argv, &$argc){
 
                foreach($res as $contact) {
 
-                       logger("Check for polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]);
-
                        $xml = false;
 
                        if($manual_id)
@@ -243,7 +241,7 @@ function poller_run(&$argv, &$argc){
                        if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
                                $contact['priority'] = 2;
 
-                       if($contact['priority'] || $contact['subhub']) {
+                       if(($contact['priority'] || $contact['subhub']) AND ($contact['network'] != NETWORK_FEED)) {
 
                                $hub_update = true;
                                $update     = false;