diff options
| author | Mario <mario@mariovavti.com> | 2022-10-21 11:20:23 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-21 11:20:23 +0200 |
| commit | 5edd13c6bb89c7434d8437f8cc74c038371fdbf8 (patch) | |
| tree | bc7f29762e9aa306f80b4881128607a49b5bb74f /Zotlabs/Lib | |
| parent | 7ca289edd0d568a51dfdf225a5ef0e9663c38838 (diff) | |
| download | volse-hubzilla-5edd13c6bb89c7434d8437f8cc74c038371fdbf8.tar.gz volse-hubzilla-5edd13c6bb89c7434d8437f8cc74c038371fdbf8.tar.bz2 volse-hubzilla-5edd13c6bb89c7434d8437f8cc74c038371fdbf8.zip | |
fix various issues
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 8380e2287..e3306ca3e 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1609,6 +1609,9 @@ class Activity { } $webfinger_addr = ''; + $hostname = ''; + $baseurl = ''; + $site_url = ''; $m = parse_url($url); if ($m) { @@ -1617,7 +1620,7 @@ class Activity { $site_url = $m['scheme'] . '://' . $m['host']; } - if (!empty($person_obj['preferredUsername']) && isset($parsed_url['host'])) { + if (!empty($person_obj['preferredUsername']) && $hostname) { $webfinger_addr = escape_tags($person_obj['preferredUsername']) . '@' . $hostname; } @@ -2331,9 +2334,6 @@ class Activity { if ($remainder) { $s['comment_policy'] = $remainder; } - if (!(isset($item['comment_policy']) && strlen($item['comment_policy']))) { - $s['comment_policy'] = 'contacts'; - } } } diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index ee551f6b8..c86eb29cd 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1911,7 +1911,7 @@ class Libzot { $stored = (($item_result && $item_result['item']) ? $item_result['item'] : false); if ((is_array($stored)) && ($stored['id'] != $stored['parent']) - && ($stored['author_xchan'] === $channel['channel_hash'] || $stored['author_xchan'] === $channel['channel_hash'])) { + && ($stored['author_xchan'] === $channel['channel_hash'])) { retain_item($stored['item']['parent']); } |