diff options
| author | nobody <nobody@zotlabs.com> | 2021-06-03 16:01:16 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-06-03 16:01:16 -0700 |
| commit | 686530c1873f98d724355bf3f456243b1b7fdadd (patch) | |
| tree | 81fdbb61a8ef8f73dc3a5009e8a2f6c5a75de712 /include | |
| parent | 462980c70a2698490d97a481cee0f2500dacb91c (diff) | |
| parent | ba22d3e9b6ef7042d7129c7715c81c668fcf79b3 (diff) | |
| download | volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.tar.gz volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.tar.bz2 volse-hubzilla-686530c1873f98d724355bf3f456243b1b7fdadd.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
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 85dd8ba02..8fa175d9a 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) ); |