diff options
| -rw-r--r-- | include/zot.php | 1 | ||||
| -rw-r--r-- | mod/post.php | 26 |
2 files changed, 17 insertions, 10 deletions
diff --git a/include/zot.php b/include/zot.php index 4c47d60b8..24ace9cbb 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2813,6 +2813,7 @@ function import_author_zot($x) { function zot_process_message_request($data) { $ret = array('success' => false); +// note: disabled until the loops stop. return $ret; if(! $data['message_id']) { diff --git a/mod/post.php b/mod/post.php index 8ffd3b5ad..c21af83e4 100644 --- a/mod/post.php +++ b/mod/post.php @@ -598,18 +598,24 @@ function post_post(&$a) { $ret['success'] = true; $ret['pickup'] = array(); foreach($r as $rr) { - $x = json_decode($rr['outq_msg'],true); + if($rr['outq_msg']) { + $x = json_decode($rr['outq_msg'],true); - if(array_key_exists('message_list',$x)) { - foreach($x['message_list'] as $xx) - $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx); - } - else - $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x); + if(! $x) + continue; - $x = q("delete from outq where outq_hash = '%s' limit 1", - dbesc($rr['outq_hash']) - ); + if(array_key_exists('message_list',$x)) { + foreach($x['message_list'] as $xx) { + $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx); + } + } + else + $ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x); + + $x = q("delete from outq where outq_hash = '%s' limit 1", + dbesc($rr['outq_hash']) + ); + } } } |