diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-06-03 11:00:39 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-06-03 11:00:39 +0200 |
| commit | e5c8273f7284fe065e88b8d7ddac2ea55964f3f0 (patch) | |
| tree | 0809eba89f4ed7248d9af04c8e84ef1b1412fb72 /include | |
| parent | 440f7bacd62cd277e8d9d4341675e8c5f5e7485a (diff) | |
| parent | 33463152e844f98b933401c394cc0e111893a077 (diff) | |
| download | volse-hubzilla-e5c8273f7284fe065e88b8d7ddac2ea55964f3f0.tar.gz volse-hubzilla-e5c8273f7284fe065e88b8d7ddac2ea55964f3f0.tar.bz2 volse-hubzilla-e5c8273f7284fe065e88b8d7ddac2ea55964f3f0.zip | |
Merge branch 'six' of https://framagit.org/hubzilla/core into six
Diffstat (limited to 'include')
| -rw-r--r-- | include/account.php | 2 | ||||
| -rw-r--r-- | include/channel.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/account.php b/include/account.php index d138dab41..98d7f00a8 100644 --- a/include/account.php +++ b/include/account.php @@ -48,7 +48,7 @@ function check_account_email($email) { $result['message'] = t('The provided email address is already registered at this site'); } - $register = q("select reg_did2 from register where reg_vital = 1 and reg_did2 = '%s' limit 1", + $register = q("select reg_did2 from register where reg_vital = 1 and reg_did2 = '%s' and reg_didx = 'e' limit 1", dbesc($email) ); if ($register) { diff --git a/include/channel.php b/include/channel.php index 91e2c37bd..c9391c0d0 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1327,7 +1327,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; } @@ -2457,7 +2457,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) ); |