aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-10-03 07:18:49 +0000
committerMario <mario@mariovavti.com>2021-10-03 07:18:49 +0000
commit28ad6a68834a21553e98f16e090ce4c227ac343c (patch)
tree0fa142c36f531676f760aa9788eb6e33fa945c44
parent9de8aefa98e4ea040db41923c2089edc5efb01a8 (diff)
downloadvolse-hubzilla-28ad6a68834a21553e98f16e090ce4c227ac343c.tar.gz
volse-hubzilla-28ad6a68834a21553e98f16e090ce4c227ac343c.tar.bz2
volse-hubzilla-28ad6a68834a21553e98f16e090ce4c227ac343c.zip
remove redundant query and exit with status 410 if channel was removed
-rw-r--r--Zotlabs/Module/Channel.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index a2e23b31e..6261a2f06 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -53,13 +53,6 @@ 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 = channelx_by_nick($which, true);
if (!$channel) {
@@ -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)) {