Merge branch '3.2.x'

phpBB/install/convert/controller/convertor.php

@@ -410,7 +410,6 @@ class convertor
 
 		switch ($this->db->get_sql_layer())
 		{
-			case 'sqlite':
 			case 'sqlite3':
 				$this->db->sql_query('DELETE FROM ' . $this->session_keys_table);
 				$this->db->sql_query('DELETE FROM ' . $this->session_table);

phpBB/install/convert/convertor.php

@@ -144,7 +144,6 @@ class convertor
 		$convert->mysql_convert = false;
 		switch ($src_db->sql_layer)
 		{
-			case 'sqlite':
 			case 'sqlite3':
 				$convert->src_truncate_statement = 'DELETE FROM ';
 				break;
@@ -176,7 +175,6 @@ class convertor
 
 		switch ($db->get_sql_layer())
 		{
-			case 'sqlite':
 			case 'sqlite3':
 				$convert->truncate_statement = 'DELETE FROM ';
 				break;

phpBB/install/convertors/functions_phpbb20.php

@@ -1827,7 +1827,6 @@ function phpbb_create_userconv_table()
 			)';
 		break;
 
-		case 'sqlite':
 		case 'sqlite3':
 			$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
 				user_id INTEGER NOT NULL DEFAULT \'0\',