mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-14 04:30:29 +01:00
Merge remote-tracking branch 'bantu/ticket/10636' into develop
* bantu/ticket/10636: [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
This commit is contained in:
commit
95ac995be8
@ -2328,7 +2328,7 @@ function cache_moderators()
|
||||
$ug_id_ary = array_keys($hold_ary);
|
||||
|
||||
// Remove users who have group memberships with DENY moderator permissions
|
||||
$sql_ary = array(
|
||||
$sql_ary_deny = array(
|
||||
'SELECT' => 'a.forum_id, ug.user_id, g.group_id',
|
||||
|
||||
'FROM' => array(
|
||||
@ -2355,7 +2355,7 @@ function cache_moderators()
|
||||
AND ug.user_pending = 0
|
||||
AND o.auth_option " . $db->sql_like_expression('m_' . $db->any_char),
|
||||
);
|
||||
$sql = $db->sql_build_query('SELECT', $sql_ary);
|
||||
$sql = $db->sql_build_query('SELECT', $sql_ary_deny);
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
|
Loading…
x
Reference in New Issue
Block a user