New config options if ostatus polling should use the priority in the contacts

diff --git a/include/poller.php b/include/poller.php
index 3be6caebd7a8305ee3624998c9ed6a1db2152fbc..f165ad590520003e037f32d13e28a0d416b1cc9b 100755 (executable)
--- a/include/poller.php
+++ b/include/poller.php
@@ -140,7 +140,10 @@ function poller_run($argv, $argc){
                        if($manual_id)
                                $contact['last-update'] = '0000-00-00 00:00:00';
 
-                       if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+                       if($contact['network'] === NETWORK_DFRN)
+                               $contact['priority'] = 2;
+
+                       if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
                                $contact['priority'] = 2;
 
                        if($contact['priority'] || $contact['subhub']) {