From 75124b0197a20947b67b502db19af79d4936f306 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:43:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/software_update_plugin.inc.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/software_update_plugin.inc.php b/server/plugins-available/software_update_plugin.inc.php
index bd8159e..640d7a9 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;
}
@@ -267,7 +267,6 @@
$app->log('Unable to create database user'.$db_config['database_user'].' '.mysqli_error($link), LOGLEVEL_ERROR);
}
- mysqli_query($link, "FLUSH PRIVILEGES;");
mysqli_close($link);
}
--
Gitblit v1.9.1