diff options
| author | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
| commit | 2c8a243ece79af05e30b1926bd372698d30f7aab (patch) | |
| tree | 9cc868f56a5456c59eb6e230803f2966c2ce9735 /Zotlabs/Daemon | |
| parent | 3372fb0761353f646ae2b7bd168650eea5fd6211 (diff) | |
| parent | af7a31cd1400a6b2f21e7c0a622ab448179f0ef8 (diff) | |
| download | volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.gz volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.bz2 volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Expire.php
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Cron_daily.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index 452ef45f1..2cf0c9119 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -96,7 +96,9 @@ class Cron_daily { Master::Summon(array('Cli_suggest')); remove_obsolete_hublocs(); + z6_discover(); + z6trans_connections(); call_hooks('cron_daily',datetime_convert()); diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index fdf0148a6..d66079216 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -737,10 +737,16 @@ class Notifier { } if(stripos($hub['site_project'], 'hubzilla') !== false && version_compare($hub['site_version'], '4.7.3', '<=')) { - $encoded_item['owner']['network'] = 'zot'; - $encoded_item['owner']['guid_sig'] = str_replace('sha256.', '', $encoded_item['owner']['guid_sig']); - $encoded_item['author']['network'] = 'zot'; - $encoded_item['author']['guid_sig'] = str_replace('sha256.', '', $encoded_item['author']['guid_sig']); + if($encoded_item['type'] === 'mail') { + $encoded_item['from']['network'] = 'zot'; + $encoded_item['from']['guid_sig'] = str_replace('sha256.', '', $encoded_item['from']['guid_sig']); + } + else { + $encoded_item['owner']['network'] = 'zot'; + $encoded_item['owner']['guid_sig'] = str_replace('sha256.', '', $encoded_item['owner']['guid_sig']); + $encoded_item['author']['network'] = 'zot'; + $encoded_item['author']['guid_sig'] = str_replace('sha256.', '', $encoded_item['author']['guid_sig']); + } } queue_insert( |