diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-06-16 14:59:17 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-06-16 14:59:17 +0100 |
| commit | 33696cc8392daeb08d011aa3b1209f3b121898ea (patch) | |
| tree | 466d48f5abc1a4ec1dbf83543471a8ac89428516 /include/deliver.php | |
| parent | 466a6d5227fbaf0a36cd76b5603cb42bb1b7462b (diff) | |
| parent | c4c80a2e472173dfed9b982c6705ccfbb6e6cdab (diff) | |
| download | volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.gz volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.bz2 volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/deliver.php')
| -rw-r--r-- | include/deliver.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/deliver.php b/include/deliver.php index c5ed35c87..547d009cc 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -23,11 +23,14 @@ function deliver_run($argv, $argc) { if($r[0]['outq_posturl'] === z_root() . '/post') { // local delivery // we should probably batch these and save a few delivery processes - $msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true)))))); - zot_import($msg); - $r = q("delete from outq where outq_hash = '%s' limit 1", - dbesc($argv[$x]) - ); + // If there is no outq_msg, this is a refresh_all message which does not require local handling + if($r[0]['outq_msg']) { + $msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true)))))); + zot_import($msg); + $r = q("delete from outq where outq_hash = '%s' limit 1", + dbesc($argv[$x]) + ); + } } else { $result = zot_zot($r[0]['outq_posturl'],$r[0]['outq_notify']); |