diff options
author | Mario <mario@mariovavti.com> | 2021-06-02 17:58:46 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-06-02 18:13:48 +0000 |
commit | ba22d3e9b6ef7042d7129c7715c81c668fcf79b3 (patch) | |
tree | 9ae960acdbf42908217d16f78268292c994dc694 /include | |
parent | 657af3024e2db87153d71692e7bec77af41d3dcc (diff) | |
download | volse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.tar.gz volse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.tar.bz2 volse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.zip |
fix issue where a deleted channel will return 404 before returning zotinfo
(cherry picked from commit 33463152e844f98b933401c394cc0e111893a077)
Diffstat (limited to 'include')
-rw-r--r-- | include/channel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php index 804d8c63a..5684f7a6b 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1407,7 +1407,7 @@ function profile_load($nickname, $profile = '') { if(! $user) { logger('profile error: ' . App::$query_string, LOGGER_DEBUG); - notice( t('Requested channel is not available.') . EOL ); + notice( t('Requested channel is not available') . EOL ); App::$error = 404; return; } @@ -2537,7 +2537,7 @@ function channelx_by_nick($nick) { return App::$channel; } - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and channel_removed = 0 LIMIT 1", + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' and channel_removed = 0 LIMIT 1", dbesc($nick) ); |