aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-04-06 11:47:46 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-04-06 11:47:46 +0200
commit73a0988f59058bfce9b42cb416acf68fc2544f63 (patch)
tree18be83072ded1ddf5f2437d911b6d1bc5088f1ff
parent90025ae3e762ac599604e031db7eb57d71abdf73 (diff)
parentfb71e6dde6a0a3b35f51f992930f8d929c709d46 (diff)
downloadforums-73a0988f59058bfce9b42cb416acf68fc2544f63.tar
forums-73a0988f59058bfce9b42cb416acf68fc2544f63.tar.gz
forums-73a0988f59058bfce9b42cb416acf68fc2544f63.tar.bz2
forums-73a0988f59058bfce9b42cb416acf68fc2544f63.tar.xz
forums-73a0988f59058bfce9b42cb416acf68fc2544f63.zip
Merge pull request #3458 from nickvergessen/ticket/8494
[ticket/8494] Ignore errors from the database schema preparation
-rw-r--r--phpBB/install/install_install.php10
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);
}