diff --git a/phpBB/phpbb/mention/source/group.php b/phpBB/phpbb/mention/source/group.php index c27c7d6d33..cf725789c1 100644 --- a/phpBB/phpbb/mention/source/group.php +++ b/phpBB/phpbb/mention/source/group.php @@ -60,10 +60,10 @@ abstract class group implements source_interface GROUPS_TABLE => 'g', ], ]); - $res = $this->db->sql_query($query); + $result = $this->db->sql_query($query); $groups = []; - while ($row = $this->db->sql_fetchrow($res)) + while ($row = $this->db->sql_fetchrow($result)) { $group_name = $this->helper->get_name($row['group_name']); $groups['names'][$row['group_id']] = $group_name; @@ -89,10 +89,10 @@ abstract class group implements source_interface public function get($keyword, $topic_id) { // Grab all group IDs - $res = $this->db->sql_query($this->query($keyword, $topic_id)); + $result = $this->db->sql_query($this->query($keyword, $topic_id)); $group_ids = []; - while ($row = $this->db->sql_fetchrow($res)) + while ($row = $this->db->sql_fetchrow($result)) { $group_ids[] = $row['group_id']; } diff --git a/phpBB/phpbb/mention/source/user.php b/phpBB/phpbb/mention/source/user.php index 69fe6b8bb8..d691634859 100644 --- a/phpBB/phpbb/mention/source/user.php +++ b/phpBB/phpbb/mention/source/user.php @@ -58,10 +58,10 @@ abstract class user implements source_interface public function get($keyword, $topic_id) { $keyword = utf8_clean_string($keyword); - $res = $this->db->sql_query_limit($this->query($keyword, $topic_id), 5); + $result = $this->db->sql_query_limit($this->query($keyword, $topic_id), 5); $names = []; - while ($row = $this->db->sql_fetchrow($res)) + while ($row = $this->db->sql_fetchrow($result)) { $user_rank = $this->user_loader->get_rank($row['user_id'], true); $names['u' . $row['user_id']] = [ diff --git a/phpBB/phpbb/textformatter/s9e/mention_helper.php b/phpBB/phpbb/textformatter/s9e/mention_helper.php index 0348809cbc..91530d5c5c 100644 --- a/phpBB/phpbb/textformatter/s9e/mention_helper.php +++ b/phpBB/phpbb/textformatter/s9e/mention_helper.php @@ -74,9 +74,9 @@ class mention_helper AND ' . $this->db->sql_in_set('u.user_type', [USER_NORMAL, USER_FOUNDER]) . ' AND ' . $this->db->sql_in_set('u.user_id', $user_ids), ]); - $res = $this->db->sql_query($query); + $result = $this->db->sql_query($query); - while ($row = $this->db->sql_fetchrow($res)) + while ($row = $this->db->sql_fetchrow($result)) { $this->cached_colors['users'][$row['user_id']] = $row['user_colour']; } @@ -91,9 +91,9 @@ class mention_helper ], 'WHERE' => $this->db->sql_in_set('g.group_id', $group_ids), ]); - $res = $this->db->sql_query($query); + $result = $this->db->sql_query($query); - while ($row = $this->db->sql_fetchrow($res)) + while ($row = $this->db->sql_fetchrow($result)) { $this->cached_colors['groups'][$row['group_id']] = $row['group_colour']; }