aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-02-09 14:08:58 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-02-09 14:18:17 +0100
commit6858485964fda2d43fd7622123ffce796b2fd365 (patch)
tree451abecc4654ad7a66d6a2059d47b5333278f712
parentcddd63aae045a833e9a3ec4bb396b3987f95cbd3 (diff)
downloadforums-6858485964fda2d43fd7622123ffce796b2fd365.tar
forums-6858485964fda2d43fd7622123ffce796b2fd365.tar.gz
forums-6858485964fda2d43fd7622123ffce796b2fd365.tar.bz2
forums-6858485964fda2d43fd7622123ffce796b2fd365.tar.xz
forums-6858485964fda2d43fd7622123ffce796b2fd365.zip
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
Regression from 4c77903129749008cd08c346006d2a57cf6ff544. PHPBB3-10636
-rw-r--r--phpBB/includes/functions_admin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 7fdf874456..2fd58a11e9 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2330,7 +2330,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(
@@ -2357,7 +2357,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))