From 73d1bf9fea8ea691f4b2b5c133ab973ea115e2e4 Mon Sep 17 00:00:00 2001 From: brunoais Date: Mon, 26 Jan 2015 19:21:22 +0000 Subject: [ticket/13544] Fixing wrong SQL query for permission_unset for roles PHPBB3-13544 --- phpBB/phpbb/db/migration/tool/permission.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 5cfbc5ca00..2daed2724a 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 = ' . $this->db->sql_escape($role_id); $this->db->sql_query($sql); break; -- cgit v1.2.1 From 4b16add055fd9486a82dc3a9b2a1105ee144a492 Mon Sep 17 00:00:00 2001 From: brunoais Date: Mon, 26 Jan 2015 22:00:20 +0000 Subject: [ticket/13544] Use integer case because $role_id is an int PHPBB3-13544 --- phpBB/phpbb/db/migration/tool/permission.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 2daed2724a..1a91127d2d 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -538,7 +538,7 @@ 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) . ' - AND role_id = ' . $this->db->sql_escape($role_id); + AND role_id = ' . (int) $role_id; $this->db->sql_query($sql); break; -- cgit v1.2.1