diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-06 11:49:18 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-06 11:49:18 +0200 |
| commit | 8523031141ed4037c5099f24e0c527a2bbaf6a75 (patch) | |
| tree | c3f2713fd0ec578ef8ac9191dfadb8e72c9b9049 /phpBB/install | |
| parent | 2962d5d7fd39d37b52fa14c7de91bb03477c072a (diff) | |
| parent | 73a0988f59058bfce9b42cb416acf68fc2544f63 (diff) | |
| download | forums-8523031141ed4037c5099f24e0c527a2bbaf6a75.tar forums-8523031141ed4037c5099f24e0c527a2bbaf6a75.tar.gz forums-8523031141ed4037c5099f24e0c527a2bbaf6a75.tar.bz2 forums-8523031141ed4037c5099f24e0c527a2bbaf6a75.tar.xz forums-8523031141ed4037c5099f24e0c527a2bbaf6a75.zip | |
Merge branch '3.1.x'
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 e38c9c5bdf..7a9fa9c81e 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -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); } |