diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-30 17:48:45 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-30 17:48:45 +0100 |
| commit | 3e710fe393ddb7067a1dc28440792d18e2d416d5 (patch) | |
| tree | 026f71f94aa772c1ac0678fabfa898b8ec2d8e73 /phpBB | |
| parent | 899173eebdf468a964ad2989f09c898a43eb6c0b (diff) | |
| parent | e5f2eee167775dd8f7f1920a9d25fcf70919f8dd (diff) | |
| download | forums-3e710fe393ddb7067a1dc28440792d18e2d416d5.tar forums-3e710fe393ddb7067a1dc28440792d18e2d416d5.tar.gz forums-3e710fe393ddb7067a1dc28440792d18e2d416d5.tar.bz2 forums-3e710fe393ddb7067a1dc28440792d18e2d416d5.tar.xz forums-3e710fe393ddb7067a1dc28440792d18e2d416d5.zip | |
Merge branch 'prep-release-3.1.3' into develop-ascraeus
Diffstat (limited to 'phpBB')
| -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; |