1 files changed, 2 insertions, 17 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index d7cbfea28f..40666c29dc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -340,21 +340,7 @@ $database_update_info = array(
 );
 
 // Determine mapping database type
-switch ($db->sql_layer)
-{
-
-	case 'mysqli':
-		$map_dbms = 'mysql';
-	break;
-
-	case 'mssql_odbc':
-		$map_dbms = 'mssql';
-	break;
-
-	default:
-		$map_dbms = $db->sql_layer;
-	break;
-}
+$map_dbms = $db->dbms_type;
 
 $error_ary = array();
 $errored = false;
@@ -624,10 +610,9 @@ _sql($sql, $errored, $error_ary);
 /* Optimize/vacuum analyze the tables where appropriate
 // this should be done for each version in future along with
 // the version number update
-switch ($db->sql_layer)
+switch ($db->dbms_type)
 {
 	case 'mysql':
-	case 'mysqli':
 		$sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words';
 		_sql($sql, $errored, $error_ary);
 	break;