From d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 15 Feb 2016 02:34:46 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
server/plugins-available/software_update_plugin.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/software_update_plugin.inc.php b/server/plugins-available/software_update_plugin.inc.php
index bd8159e..83fb831 100644
--- a/server/plugins-available/software_update_plugin.inc.php
+++ b/server/plugins-available/software_update_plugin.inc.php
@@ -248,7 +248,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_ERROR);
+ $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_ERROR);
return;
}
--
Gitblit v1.9.1