Merge pull request #3458 from nickvergessen/ticket/8494

[ticket/8494] Ignore errors from the database schema preparation
This commit is contained in:
Tristan Darricau 2015-04-06 11:47:46 +02:00
commit 73a0988f59

View file

@ -1164,12 +1164,10 @@ class install_install extends module
foreach ($sql_query as $sql) foreach ($sql_query as $sql)
{ {
//$sql = trim(str_replace('|', ';', $sql)); // Ignore errors when the functions or types already exist
if (!$db->sql_query($sql)) // to allow installing phpBB twice in the same database with
{ // a different prefix
$error = $db->sql_error(); $db->sql_query($sql);
$this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__);
}
} }
unset($sql_query); unset($sql_query);
} }