diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-10-03 09:05:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-10-03 09:05:32 +0200 |
| commit | 4afd1ac705b7e0b8db7bbfacc5f46e0e42c9d4f1 (patch) | |
| tree | 9449215a7a13ecc7bd1a8189d3a3100296673000 /Zotlabs | |
| parent | 574a01727ec500ee0c6be0965c5021927c802d52 (diff) | |
| download | volse-hubzilla-4afd1ac705b7e0b8db7bbfacc5f46e0e42c9d4f1.tar.gz volse-hubzilla-4afd1ac705b7e0b8db7bbfacc5f46e0e42c9d4f1.tar.bz2 volse-hubzilla-4afd1ac705b7e0b8db7bbfacc5f46e0e42c9d4f1.zip | |
add optional $removed argument to channelx_by functions to allow inclusion of removed channels which is required (mod channel, daemon notifier -> refresh_all) if a channel got removed also remove caching to App so we always get a fresh copy. In import_hublocs() add site_id to the array passed to Libzot::gethubs() because it is expected there.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Channel.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 0ae887932..64f192bb2 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -170,7 +170,7 @@ class Notifier { elseif ($cmd === 'refresh_all') { logger('notifier: refresh_all: ' . $item_id); - self::$channel = channelx_by_n($item_id); + self::$channel = channelx_by_n($item_id, true); $r = q("select abook_xchan from abook where abook_channel = %d", intval($item_id) diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index f726426ad..a2e23b31e 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -60,7 +60,7 @@ class Channel extends Controller { dbesc($which) ); - $channel = $r[0]; + $channel = channelx_by_nick($which, true); if (!$channel) { http_status_exit(404, 'Not found'); |