makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'bantu/ticket/10636' into develop

Browse source 
* bantu/ticket/10636:
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
This commit is contained in:
Oleg Pudeyev 2012-02-10 13:25:46 -05:00
commit 95ac995be8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_admin.php
View file

@ -2328,7 +2328,7 @@ function cache_moderators()
$ug_id_ary = array_keys($hold_ary); $ug_id_ary = array_keys($hold_ary);
// Remove users who have group memberships with DENY moderator permissions // 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', 'SELECT' => 'a.forum_id, ug.user_id, g.group_id',
'FROM' => array( 'FROM' => array(
@ -2355,7 +2355,7 @@ function cache_moderators()
AND ug.user_pending = 0 AND ug.user_pending = 0
AND o.auth_option " . $db->sql_like_expression('m_' . $db->any_char), 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); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))