From: Joe <joe.hunt.consulting@gmail.com>
Date: Fri, 28 Jun 2024 12:32:40 +0000 (+0200)
Subject: Rerun of connect_db_mysqli.inc.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=171fccc957f046c4c92089b20a250aa50760b849;p=fa-stable.git

Rerun of connect_db_mysqli.inc.
---

diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index d0290b3e..3519f84c 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -27,9 +27,6 @@ function set_global_connection($company=-1)
 
 	$_SESSION["wa_current_user"]->cur_con = $company;
 
-    if (!is_string($db_connections[$company]['tbpref'])) 
-		$db_connections[$company]['tbpref'] = '';
-
 	$connection = $db_connections[$company];
 
 	$db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "", 
@@ -55,7 +52,7 @@ function db_query($sql, $err_msg=null)
 
 	// set current db prefix
 	$comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
-	$cur_prefix = @$db_connections[$comp]['tbpref'];
+	$cur_prefix = (string)@$db_connections[$comp]['tbpref'];
 	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
 
 	if ($SysPrefs->show_sql)