Fix getting the proper dbname

Author: iMattPro

includes/qi_functions.php

@@ -463,17 +463,19 @@ function db_connect($db_data = '')
 
 	if (empty($db_data))
 	{
-		list($dbms, $dbhost, $dbuser, $dbpasswd, $dbport) = $settings->get_db_data();
+		list($dbms, $dbhost, $dbuser, $dbpasswd, $dbport, $db_prefix) = $settings->get_db_data();
 		// When db_data is empty, it means the db does not exist yet, so for postgres
 		// we need to set dbname to false so the driver can connect to the postgres db
 		$dbname = ($dbms !== 'postgres') ? $settings->get_config('dbname') : false;
 	}
 	else
 	{
-		list($dbms, $dbhost, $dbuser, $dbpasswd, $dbport) = $db_data;
+		list($dbms, $dbhost, $dbuser, $dbpasswd, $dbport, $db_prefix) = $db_data;
 		$dbname = $settings->get_config('dbname');
 	}
 
+	$dbname = $dbname ? $db_prefix . $dbname : $dbname;
+
 	// If we get here and the extension isn't loaded it should be safe to just go ahead and load it
 	$available_dbms = qi_get_available_dbms($dbms);
 

includes/settings.php

@@ -477,6 +477,7 @@ public function get_db_data()
 			$this->get_config('dbuser'),
 			$this->get_config('dbpasswd'),
 			$this->get_config('dbport'),
+			$this->get_config('db_prefix'),
 		];
 	}