github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 05:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Fixed null $u_data if user not found (#781)"

Browse source 
This reverts commit 1d1f9fa4aa.
This commit is contained in:
Roman Kelesidis 2023-06-06 14:46:54 +07:00
commit 9202ecbc91
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
library/includes/functions.php
View file

@ -958,7 +958,7 @@ function clean_username($username)
} }
// Get Userdata, $u can be username or user_id. If $force_name is true, the username will be forced. // Get Userdata, $u can be username or user_id. If $force_name is true, the username will be forced.
function get_userdata($u, bool $force_name = false, bool $allow_guest = false) function get_userdata($u, $force_name = false, $allow_guest = false)
{ {
if (!$u) { if (!$u) {
return false; return false;
@ -970,9 +970,12 @@ function get_userdata($u, bool $force_name = false, bool $allow_guest = false)
} }
} }
$u_data = array();
$name_search = false;
$exclude_anon_sql = (!$allow_guest) ? "AND user_id != " . GUEST_UID : ''; $exclude_anon_sql = (!$allow_guest) ? "AND user_id != " . GUEST_UID : '';
if ($force_name || !is_int($u)) { if ($force_name || !is_numeric($u)) {
$name_search = true;
$where_sql = "WHERE username = '" . DB()->escape(clean_username($u)) . "'"; $where_sql = "WHERE username = '" . DB()->escape(clean_username($u)) . "'";
} else { } else {
$where_sql = "WHERE user_id = " . (int)$u; $where_sql = "WHERE user_id = " . (int)$u;
@ -981,7 +984,11 @@ function get_userdata($u, bool $force_name = false, bool $allow_guest = false)
$sql = "SELECT * FROM " . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1"; $sql = "SELECT * FROM " . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
if (!$u_data = DB()->fetch_row($sql)) { if (!$u_data = DB()->fetch_row($sql)) {
return false; if (!is_int($u) && !$name_search) {
$where_sql = "WHERE username = '" . DB()->escape(clean_username($u)) . "'";
$sql = "SELECT * FROM " . BB_USERS . " $where_sql $exclude_anon_sql LIMIT 1";
$u_data = DB()->fetch_row($sql);
}
} }
if ($u_data['user_id'] == GUEST_UID) { if ($u_data['user_id'] == GUEST_UID) {