diff options
| author | friendica <info@friendica.com> | 2013-06-14 16:54:58 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-14 16:54:58 -0700 |
| commit | 765d6e0a97f135755d6ec1322f6e3272bc0ae620 (patch) | |
| tree | ac7d0691343a0c0951ff19b1ee46cd21afaf3c4c /include/deliver.php | |
| parent | 9b67e114ad9da2b5e0456709affd20d9c760e4ae (diff) | |
| download | volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.tar.gz volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.tar.bz2 volse-hubzilla-765d6e0a97f135755d6ec1322f6e3272bc0ae620.zip | |
push refresh messages, performance work on conversations and configs, doc updates
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']); |