diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-03-01 17:37:26 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-03-01 17:37:26 +0100 |
| commit | fb71e6dde6a0a3b35f51f992930f8d929c709d46 (patch) | |
| tree | d19e96d9a0863a5928cd429a2333fa63b9b06bc1 /phpBB/install | |
| parent | 18de60c0e099c2af41d853cfeb5799a09e0da630 (diff) | |
| download | forums-fb71e6dde6a0a3b35f51f992930f8d929c709d46.tar forums-fb71e6dde6a0a3b35f51f992930f8d929c709d46.tar.gz forums-fb71e6dde6a0a3b35f51f992930f8d929c709d46.tar.bz2 forums-fb71e6dde6a0a3b35f51f992930f8d929c709d46.tar.xz forums-fb71e6dde6a0a3b35f51f992930f8d929c709d46.zip | |
[ticket/8494] Ignore errors from the database schema preparation
This allows installing phpBB twice in the same database with a different
prefix
PHPBB3-8494
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 3a6858a254..6f7fbd9d5f 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1164,12 +1164,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); } |