mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Tristan Darricau
2015-04-06 11:49:18 +02:00
parent 2962d5d7fd 73a0988f59
commit 8523031141
1 changed files with 4 additions and 6 deletions
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)
{
//$sql = trim(str_replace('|', ';', $sql));
if (!$db->sql_query($sql))
{
$error = $db->sql_error();
$this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__);
}
// Ignore errors when the functions or types already exist
// to allow installing phpBB twice in the same database with
// a different prefix
$db->sql_query($sql);
}
unset($sql_query);
}