X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Freceive.php;h=68fc7f69fe962143346fc92bff02f82cf35c5f27;hb=7003f576e27bc1590329556c8b801bafbb324cea;hp=8b28c1656225cc60dba12e6c0a38c6b9c45f528a;hpb=192a5e254a84a6beb755f50f5e2975bd910dcaf3;p=friendica.git diff --git a/mod/receive.php b/mod/receive.php index 8b28c16562..68fc7f69fe 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -17,11 +17,11 @@ function receive_post(App $a) { http_status_exit(500); } - $public = false; - if (($a->argc == 2) && ($a->argv[1] === 'public')) { $public = true; + $importer = false; } else { + $public = false; if ($a->argc != 3 || $a->argv[1] !== 'users') { http_status_exit(500); @@ -49,8 +49,13 @@ function receive_post(App $a) { logger('mod-diaspora: message is in the new format', LOGGER_DEBUG); $msg = Diaspora::decode_raw($importer, $postdata); } else { - logger('mod-diaspora: message is in the old format', LOGGER_DEBUG); + logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG); $msg = Diaspora::decode($importer, $xml); + + if ($public && !$msg) { + logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG); + $msg = Diaspora::decode_raw($importer, $xml); + } } logger('mod-diaspora: decoded', LOGGER_DEBUG);