aboutsummaryrefslogtreecommitdiffstats
path: root/include/deliver.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-11 14:33:07 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-11 14:33:07 -0700
commit45e1f93e564ab539941b3dccfa6b9f5654ff0203 (patch)
treeb912fe877c8ea3d83619c83ee3f774d4c904ca51 /include/deliver.php
parent77807d439ec964df295d29b33455849c9a11dc92 (diff)
parente062c4e6b54c6162d118f8657eb6f81c971f0dd8 (diff)
downloadvolse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.tar.gz
volse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.tar.bz2
volse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: util/messages.po
Diffstat (limited to 'include/deliver.php')
-rw-r--r--include/deliver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/deliver.php b/include/deliver.php
index 5ab44a620..26739fb06 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -92,12 +92,12 @@ function deliver_run($argv, $argc) {
$m = json_decode($r[0]['outq_msg'],true);
if(array_key_exists('message_list',$m)) {
foreach($m['message_list'] as $mm) {
- $msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $mm)))));
+ $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm)))));
zot_import($msg,z_root());
}
}
else {
- $msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $m)))));
+ $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
zot_import($msg,z_root());
}
$r = q("delete from outq where outq_hash = '%s'",