projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6368404
)
Rerun of connect_db_mysqli.inc.
master
github/master
author
Joe
<joe.hunt.consulting@gmail.com>
Fri, 28 Jun 2024 12:32:40 +0000
(14:32 +0200)
committer
Joe
<joe.hunt.consulting@gmail.com>
Fri, 28 Jun 2024 12:32:40 +0000
(14:32 +0200)
includes/db/connect_db_mysqli.inc
patch
|
blob
|
history
diff --git
a/includes/db/connect_db_mysqli.inc
b/includes/db/connect_db_mysqli.inc
index d0290b3ed86e753029366cb2f07aba03facf6c15..3519f84cf28646a17b9cb45c65859868f56cc4ef 100644
(file)
--- 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;
$_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"], "",
$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;
// 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)
$sql = str_replace(TB_PREF, $cur_prefix, $sql);
if ($SysPrefs->show_sql)