From fb71e6dde6a0a3b35f51f992930f8d929c709d46 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 1 Mar 2015 17:37:26 +0100 Subject: [PATCH] [ticket/8494] Ignore errors from the database schema preparation This allows installing phpBB twice in the same database with a different prefix PHPBB3-8494 --- phpBB/install/install_install.php | 10 ++++------ 1 file 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); }