diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /include/deliver.php | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'include/deliver.php')
| -rw-r--r-- | include/deliver.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/deliver.php b/include/deliver.php index a9f4fc220..47d8562df 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -40,6 +40,10 @@ function deliver_run($argv, $argc) { $notify = json_decode($r[0]['outq_notify'],true); + // Check if this is a conversation request packet. It won't have outq_msg + // but will be an encrypted packet - so will need to be handed off to + // web delivery rather than processed inline. + $sendtoweb = false; if(array_key_exists('iv',$notify) && (! $r[0]['outq_msg'])) $sendtoweb = true; @@ -48,8 +52,7 @@ function deliver_run($argv, $argc) { logger('deliver: local delivery', LOGGER_DEBUG); // local delivery // we should probably batch these and save a few delivery processes - // If there is no outq_msg, this is a refresh_all message which does not require local handling - // also send 'request' packets to the webservice so it can decode the packet + if($r[0]['outq_msg']) { $m = json_decode($r[0]['outq_msg'],true); if(array_key_exists('message_list',$m)) { |