diff options
| author | Mario <mario@mariovavti.com> | 2021-10-03 07:11:27 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-10-03 07:11:27 +0000 |
| commit | 9de8aefa98e4ea040db41923c2089edc5efb01a8 (patch) | |
| tree | b174225fd5b06afeefa34e89d6b57877c7544f08 /Zotlabs | |
| parent | 66c273ae8d54588dc83e1da6e67c71030abeefa3 (diff) | |
| parent | b27fbf209e57e95c94de7667500ef8e7c63e638b (diff) | |
| download | volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.tar.gz volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.tar.bz2 volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
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'); |