diff options
| author | Mario <mario@mariovavti.com> | 2021-11-09 09:10:19 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-11-09 09:10:19 +0000 |
| commit | fe7ecede700fe04631d23f36473e697ce2b364dc (patch) | |
| tree | e713fc39dba500a25cb2acf8561e286fb8b41ff0 /Zotlabs/Module/Channel.php | |
| parent | 42de18d96d201d74e5df3ed1b8f6132cb00357b6 (diff) | |
| parent | 089708ab9f90309a0c27ae633cf8f2604fce1170 (diff) | |
| download | volse-hubzilla-6.4.tar.gz volse-hubzilla-6.4.tar.bz2 volse-hubzilla-6.4.zip | |
Merge branch '6.4RC'6.4
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index f726426ad..6261a2f06 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -53,14 +53,7 @@ class Channel extends Controller { $profile = argv(1); } - - // Do not use channelx_by_nick() here since it will dismiss deleted channels. - // We need to provide zotinfo for deleted channels so that directories can pick up the info. - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' LIMIT 1", - dbesc($which) - ); - - $channel = $r[0]; + $channel = channelx_by_nick($which, true); if (!$channel) { http_status_exit(404, 'Not found'); @@ -100,7 +93,7 @@ class Channel extends Controller { } if ($channel['channel_removed']) { - http_status_exit(404, 'Not found'); + http_status_exit(410, 'Gone'); } if (ActivityStreams::is_as_request($channel)) { |