2 files changed, 5 insertions, 7 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 5d2398528b..553d873b25 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.1.3',
+	'phpbb_version'	=> '3.1.4',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Limited</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 8f39328adb..3c37a028cb 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1196,12 +1196,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);
 		}