diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 13:25:46 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 13:25:46 -0500 |
| commit | 95ac995be8cdf0b7acf1aa7a03064bae4fab00b9 (patch) | |
| tree | 735c5bb47c4957b8504815cf6eeaf6cd61a4997d /phpBB/includes/functions_admin.php | |
| parent | 56ef5d5025597d2d3528b59dc3e92f6f7978801f (diff) | |
| parent | 6858485964fda2d43fd7622123ffce796b2fd365 (diff) | |
| download | forums-95ac995be8cdf0b7acf1aa7a03064bae4fab00b9.tar forums-95ac995be8cdf0b7acf1aa7a03064bae4fab00b9.tar.gz forums-95ac995be8cdf0b7acf1aa7a03064bae4fab00b9.tar.bz2 forums-95ac995be8cdf0b7acf1aa7a03064bae4fab00b9.tar.xz forums-95ac995be8cdf0b7acf1aa7a03064bae4fab00b9.zip | |
Merge remote-tracking branch 'bantu/ticket/10636' into develop
* bantu/ticket/10636:
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 7b4393f383..9798e514c1 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -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)) |