aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-19 20:48:40 -0700
committerredmatrix <git@macgirvin.com>2016-05-19 20:48:40 -0700
commit853322e7d2734ad459a4e5740f3f1806ed55532e (patch)
tree3c6d3524d314f477c9fdc06b1ec243fed37ee1b6
parent9cb1ac3de5d0f540bc6e1f5b1f4277b5a5bb9e67 (diff)
downloadvolse-hubzilla-853322e7d2734ad459a4e5740f3f1806ed55532e.tar.gz
volse-hubzilla-853322e7d2734ad459a4e5740f3f1806ed55532e.tar.bz2
volse-hubzilla-853322e7d2734ad459a4e5740f3f1806ed55532e.zip
don't try to deliver empty hashes
-rw-r--r--Zotlabs/Daemon/Deliver.php3
-rw-r--r--include/network.php3
2 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php
index 7a321a1f8..dbc311cf5 100644
--- a/Zotlabs/Daemon/Deliver.php
+++ b/Zotlabs/Daemon/Deliver.php
@@ -17,6 +17,9 @@ class Deliver {
for($x = 1; $x < $argc; $x ++) {
+ if(! $argv[$x])
+ continue;
+
$dresult = null;
$r = q("select * from outq where outq_hash = '%s' limit 1",
dbesc($argv[$x])
diff --git a/include/network.php b/include/network.php
index f80244f8f..a2e655d92 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1916,6 +1916,9 @@ function do_delivery($deliveries) {
$deliver = array();
foreach($deliveries as $d) {
+ if(! $d)
+ continue;
+
$deliver[] = $d;
if(count($deliver) >= $deliveries_per_process) {