From 52e0277958bafb86d27329d8d05fa54102ecd34b Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 3 May 2024 21:29:42 +0200 Subject: [PATCH] Allow for a dbmaster to be on the same host but different port, #6691 --- server/lib/app.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php index 4bd7360218..7f35b05a3b 100644 --- a/server/lib/app.inc.php +++ b/server/lib/app.inc.php @@ -83,7 +83,10 @@ class app extends stdClass { if we are in a multiserver setup */ - if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) { + if($conf['dbmaster_host'] != '' + && ($conf['dbmaster_host'] != $conf['db_host'] + || ($conf['dbmaster_host'] == $conf['db_host'] + && ($conf['dbmaster_database'] != $conf['db_database'] || $conf['dbmaster_port'] != $conf['db_port'])))) { try { $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database'], $conf['dbmaster_port'], $conf['dbmaster_client_flags']); } catch (Exception $e) { -- GitLab