Merge branch '3.2.x'

This commit is contained in:
Derky 2018-09-15 13:00:28 +02:00
commit 29e1e26180

View file

@ -85,13 +85,11 @@ class remove_outdated_media extends \phpbb\db\migration\migration
WHERE ' . $this->db->sql_in_set('group_id', $group_ids); WHERE ' . $this->db->sql_in_set('group_id', $group_ids);
} }
$result = $this->db->sql_query($sql); $this->db->sql_query($sql);
$this->db->sql_freeresult($result);
// delete the now empty, outdated media extension groups // delete the now empty, outdated media extension groups
$sql = 'DELETE FROM ' . EXTENSION_GROUPS_TABLE . ' $sql = 'DELETE FROM ' . EXTENSION_GROUPS_TABLE . '
WHERE ' . $this->db->sql_in_set('group_id', $group_ids); WHERE ' . $this->db->sql_in_set('group_id', $group_ids);
$result = $this->db->sql_query($sql); $this->db->sql_query($sql);
$this->db->sql_freeresult($result);
} }
} }