makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Tristan Darricau 2015-04-06 11:49:18 +02:00
commit 8523031141
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/install/install_install.php
View file

@ -1167,12 +1167,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);
} }