From 88c307b0ef30a94ea5e9b52a1f9078bf04033d29 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 10 Feb 2016 06:55:01 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/db_mysql.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index e3d0c69..da6bff9 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -558,7 +558,7 @@
/* Connect to the database */
$link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
if (!$link) {
- $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_DEBUG);
+ $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
return;
}
/* Get database-size from information_schema */
--
Gitblit v1.9.1