diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-12-05 12:32:33 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-12-05 12:32:33 +0100 |
| commit | 4cd5529027efa19288ddce125f0d41ccb5519578 (patch) | |
| tree | 69b5bb1b43d807908d38d7febec21732fd334a49 /Zotlabs/Lib/Libzot.php | |
| parent | 5ac08ec3aa8ede14141390670a8097a60769e11e (diff) | |
| parent | d12744011affe7f6b79201442ad9fce6e083bdbb (diff) | |
| download | volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.gz volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.bz2 volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Lib/Libzot.php')
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 70f013eb7..0fbde9765 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1418,7 +1418,7 @@ logger('4'); $DR = new DReport(z_root(),$sender,$d,$arr['mid']); - $channel = channelx_by_hash($d); + $channel = channelx_by_portid($d); if (! $channel) { $DR->update('recipient not found'); @@ -1505,8 +1505,10 @@ logger('4'); } } - if($arr['mid'] != $arr['parent_mid']) { +logger('item: ' . print_r($arr,true), LOGGER_DATA); + if($arr['mid'] !== $arr['parent_mid']) { +logger('checking source: "' . $arr['mid'] . '" != "' . $arr['parent_mid'] . '"'); // check source route. // We are only going to accept comments from this sender if the comment has the same route as the top-level-post, // this is so that permissions mismatches between senders apply to the entire conversation @@ -1591,7 +1593,7 @@ logger('4'); $arr['route'] = $last_prior_route; } } - +logger('hey'); $ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'", intval($channel['channel_id']), dbesc($arr['owner_xchan']) |