diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-30 17:48:54 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-30 17:48:54 +0100 |
| commit | 1b185413bf62a94d8c5119cf4a86c0a0b366d00a (patch) | |
| tree | 564a5e137d1f7d9ae5ca6b1b29741dd0b7d3cc78 /phpBB/phpbb/db | |
| parent | 3d4555296d55eab46999579b300ade75620ac9c0 (diff) | |
| parent | 3e710fe393ddb7067a1dc28440792d18e2d416d5 (diff) | |
| download | forums-1b185413bf62a94d8c5119cf4a86c0a0b366d00a.tar forums-1b185413bf62a94d8c5119cf4a86c0a0b366d00a.tar.gz forums-1b185413bf62a94d8c5119cf4a86c0a0b366d00a.tar.bz2 forums-1b185413bf62a94d8c5119cf4a86c0a0b366d00a.tar.xz forums-1b185413bf62a94d8c5119cf4a86c0a0b366d00a.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/permission.php | 3 |
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; |