From 024da85108cd1b05dfa37398e60fbfecc945efce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=2E=20T=C3=A4ffner?= <darkalex@firesplash.de>
Date: Thu, 8 Sep 2016 18:32:10 +0200
Subject: [PATCH] temp commit - will likely be reverted
---
install/lib/installer_base.lib.php | 2 +-
install/lib/mysql.lib.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index b8b0416328..32f02b342b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2335,7 +2335,7 @@ Email Address []:
$xmpp_server_enabled = ($conf['services']['xmpp'])?1:0;
$sql = "UPDATE ?? SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ?, proxy_server = ?, firewall_server = ?, xmpp_server = ? WHERE server_id = ?";
- $this->db->query($sql, $conf['mysql']['database'].'server', $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $proxy_server_enabled, $firewall_server_enabled, $xmpp_server_enabled, $conf['server_id']);
+ $this->db->query($sql, 'server', $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $proxy_server_enabled, $firewall_server_enabled, $xmpp_server_enabled, $conf['server_id']);
if($conf['mysql']['master_slave_setup'] == 'y') {
$this->dbmaster->query($sql, $conf['mysql']['master_database'].'server', $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $proxy_server_enabled, $firewall_server_enabled, $xmpp_server_enabled, $conf['server_id']);
}
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index 7cf06ee044..923211af41 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -44,7 +44,7 @@ class db extends mysqli
private $dbClientFlags = 0; // MySQL Client falgs
/**#@-*/
- public $show_error_messages = false; // false in server, true in interface
+ public $show_error_messages = true; // false in server, true in interface
/* old things - unused now ////
--
GitLab