aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-30 17:45:21 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-30 17:45:21 +0100
commite5f2eee167775dd8f7f1920a9d25fcf70919f8dd (patch)
treeac858bdf00497654a2c42a96c37f6631f21544cf /phpBB
parentb6786f8ba10434603e630f0962dcf6384ade32a0 (diff)
parent4b16add055fd9486a82dc3a9b2a1105ee144a492 (diff)
downloadforums-e5f2eee167775dd8f7f1920a9d25fcf70919f8dd.tar
forums-e5f2eee167775dd8f7f1920a9d25fcf70919f8dd.tar.gz
forums-e5f2eee167775dd8f7f1920a9d25fcf70919f8dd.tar.bz2
forums-e5f2eee167775dd8f7f1920a9d25fcf70919f8dd.tar.xz
forums-e5f2eee167775dd8f7f1920a9d25fcf70919f8dd.zip
Merge pull request #3341 from brunoais/ticket/13544
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/db/migration/tool/permission.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index 5cfbc5ca00..1a91127d2d 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -537,7 +537,8 @@ class permission implements \phpbb\db\migration\tool\tool_interface
}
$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
- WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+ WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove) . '
+ AND role_id = ' . (int) $role_id;
$this->db->sql_query($sql);
break;