diff options
| -rw-r--r-- | Zotlabs/Daemon/Queue.php | 3 | ||||
| -rw-r--r-- | include/network.php | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php index 91aba831a..6cb059ecd 100644 --- a/Zotlabs/Daemon/Queue.php +++ b/Zotlabs/Daemon/Queue.php @@ -55,6 +55,9 @@ class Queue { foreach ($qItems as $qItem) { $deliveries[] = $qItem['outq_hash']; } + shuffle($deliveries); + hz_syslog(print_r($deliveries, true)); + do_delivery($deliveries, true); } } diff --git a/include/network.php b/include/network.php index f0642d8f7..b34fdffcc 100644 --- a/include/network.php +++ b/include/network.php @@ -1729,12 +1729,14 @@ function deliverable_singleton($channel_id,$xchan) { intval($channel_id), dbesc($xchan_hash) ); + if($r) { if(! $r[0]['abook_instance']) return true; if(strpos($r[0]['abook_instance'],z_root()) !== false) return true; } + return false; } |