3 files changed, 19 insertions, 17 deletions
diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
index 85ab7ab28d..97a6290066 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/includes/di/extension/config.php
@@ -44,7 +44,7 @@ class phpbb_di_extension_config extends Extension
 
 		$container->setParameter('core.table_prefix', $table_prefix);
 		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
-		$container->setParameter('dbal.driver.class', $this->convert_30_dbms($dbms));
+		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
 		$container->setParameter('dbal.dbhost', $dbhost);
 		$container->setParameter('dbal.dbuser', $dbuser);
 		$container->setParameter('dbal.dbpasswd', $dbpasswd);
@@ -80,20 +80,4 @@ class phpbb_di_extension_config extends Extension
 
 		return $acm_type;
 	}
-
-	/**
-	* Convert 3.0 dbms to 3.1 db driver class name
-	*
-	* @param string $dbms dbms parameter
-	* @return db driver class
-	*/
-	protected function convert_30_dbms($dbms)
-	{
-		if (!preg_match('#^phpbb_db_driver_#', $dbms))
-		{
-			return 'phpbb_db_driver_'.$dbms;
-		}
-
-		return $dbms;
-	}
 }
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 804d89d1a2..045a28672b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5412,3 +5412,19 @@ function phpbb_to_numeric($input)
 {
 	return ($input > PHP_INT_MAX) ? (float) $input : (int) $input;
 }
+
+/**
+* Convert 3.0 dbms to 3.1 db driver class name
+*
+* @param string $dbms dbms parameter
+* @return db driver class
+*/
+function phpbb_convert_30_dbms_to_31($dbms)
+{
+	if (!preg_match('#^phpbb_db_driver_#', $dbms))
+	{
+		return 'phpbb_db_driver_'.$dbms;
+	}
+
+	return $dbms;
+}
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index f0fb8c3c06..6bbedacbe2 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -260,6 +260,8 @@ class phpbb_questionnaire_phpbb_data_provider
 		include("{$phpbb_root_path}config.$phpEx");
 		unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution
 
+		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+
 		// Only send certain config vars
 		$config_vars = array(
 			'active_sessions' => true,