diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-16 20:08:10 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-16 20:08:10 -0800 |
| commit | 05de59d4ad174cb106c3a5b5890732af51730384 (patch) | |
| tree | 29b17f02802ab478c522904f5443e9829f1c9254 /include/queue_fn.php | |
| parent | 2de1285121b5f0260699a93249bab11dc74edec5 (diff) | |
| download | volse-hubzilla-05de59d4ad174cb106c3a5b5890732af51730384.tar.gz volse-hubzilla-05de59d4ad174cb106c3a5b5890732af51730384.tar.bz2 volse-hubzilla-05de59d4ad174cb106c3a5b5890732af51730384.zip | |
initial z6 delivery
Diffstat (limited to 'include/queue_fn.php')
| -rw-r--r-- | include/queue_fn.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php index 88da90479..d1c50de67 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -217,19 +217,19 @@ function queue_deliver($outq, $immediate = false) { logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG); - - - $msg = $outq['outq_notify']; $channel = null; if($outq['outq_msg']) { - $tmp = json_decode($msg,true); - $tmp['pickup'] = json_decode($outq['outq_msg'],true); - $msg = json_encode($tmp); + $msg = json_decode($outq['outq_notify'],true); + $msg['pickup'] = [ 'notify' => json_decode($outq['outq_notify'],true), 'message' => json_decode($outq['outq_msg'],true) ]; + $msg = json_encode($msg); if($outq['outq_channel']) { $channel = channelx_by_n($outq['outq_channel']); } } + else { + $msg = $outq['outq_notify']; + } $result = zot_zot($outq['outq_posturl'],$msg,$channel); |