mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 23:07:39 +02:00
Code Issues Releases Wiki Activity

[ticket/13713] Change $res to $result

Browse Source 
PHPBB3-13713
This commit is contained in:
lavigor
2018-06-06 19:32:15 +03:00
committed by Marc Alexander
parent 8817e23474
commit 99fe591088
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/mention/source/group.php
View File

@@ -60,10 +60,10 @@ abstract class group implements source_interface
GROUPS_TABLE => 'g', GROUPS_TABLE => 'g',
], ],
]); ]);
$res = $this->db->sql_query($query); $result = $this->db->sql_query($query);
$groups = []; $groups = [];
while ($row = $this->db->sql_fetchrow($res)) while ($row = $this->db->sql_fetchrow($result))
{ {
$group_name = $this->helper->get_name($row['group_name']); $group_name = $this->helper->get_name($row['group_name']);
$groups['names'][$row['group_id']] = $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) public function get($keyword, $topic_id)
{ {
// Grab all group IDs // 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 = []; $group_ids = [];
while ($row = $this->db->sql_fetchrow($res)) while ($row = $this->db->sql_fetchrow($result))
{ {
$group_ids[] = $row['group_id']; $group_ids[] = $row['group_id'];
} }

4
phpBB/phpbb/mention/source/user.php
View File

@@ -58,10 +58,10 @@ abstract class user implements source_interface
public function get($keyword, $topic_id) public function get($keyword, $topic_id)
{ {
$keyword = utf8_clean_string($keyword); $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 = []; $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); $user_rank = $this->user_loader->get_rank($row['user_id'], true);
$names['u' . $row['user_id']] = [ $names['u' . $row['user_id']] = [

8
phpBB/phpbb/textformatter/s9e/mention_helper.php
View File

@@ -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_type', [USER_NORMAL, USER_FOUNDER]) . '
AND ' . $this->db->sql_in_set('u.user_id', $user_ids), 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']; $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), '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']; $this->cached_colors['groups'][$row['group_id']] = $row['group_colour'];
} }