diff options
author | Mario <mario@mariovavti.com> | 2020-10-14 12:33:38 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2020-10-14 12:33:38 +0000 |
commit | ba0f24bf708feac026fc11e0ed1c6c0b920fa1c6 (patch) | |
tree | b4852f08611338e4d44a91e4d9d5d181c434a748 | |
parent | 91dd877c2d022b8939ab5602753ce247b8603c0b (diff) | |
parent | 522b92128f076114da8f25e18151387d9012d33c (diff) | |
download | volse-hubzilla-ba0f24bf708feac026fc11e0ed1c6c0b920fa1c6.tar.gz volse-hubzilla-ba0f24bf708feac026fc11e0ed1c6c0b920fa1c6.tar.bz2 volse-hubzilla-ba0f24bf708feac026fc11e0ed1c6c0b920fa1c6.zip |
Merge branch 'dev' into 5.0RC
-rw-r--r-- | include/zot.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php index 1a0ebdacb..4fa8bf14c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1964,8 +1964,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ dbesc($best_owner_xchan) ); - if($ab) + if($ab) { + logger('rewrite owner: ' . $arr['owner_xchan'] . ' > ' . $best_owner_xchan); $arr['owner_xchan'] = $best_owner_xchan; + } } $best_author_xchan = find_best_zot_identity($arr['author_xchan']); @@ -1975,9 +1977,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ dbesc($best_author_xchan) ); - if($ab_author) + if($ab_author) { + logger('rewrite author: ' . $arr['author_xchan'] . ' > ' . $best_author_xchan); $arr['author_xchan'] = $best_author_xchan; - + } $abook = (($ab) ? $ab[0] : null); @@ -5382,7 +5385,7 @@ function find_best_zot_identity($xchan) { ); if ($r) { $r = Libzot::zot_record_preferred($r); - logger('find_best_zot_identity: ' . $xchan . ' > ' . $r['hubloc_hash']); + hz_syslog('find_best_zot_identity: ' . $xchan . ' > ' . $r['hubloc_hash']); return $r['hubloc_hash']; } } |