Skip to content

Commit 21b1c30

Browse files
author
Till Brehm
committed
Update mysql_clientdb_plugin.inc.php
1 parent 6322f58 commit 21b1c30

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

server/plugins-available/mysql_clientdb_plugin.inc.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ function process_host_list($action, $database_name, $database_user, $database_pa
153153
// mariadb or mysql < 5.7
154154
if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) {
155155
$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
156-
$link->escape_string($data['new']['database_user']),
156+
$link->escape_string($database_user),
157157
$db_host,
158-
$link->escape_string($data['new']['database_password']));
158+
$link->escape_string($database_password));
159159
if(!$link->query($query)) $success = false;
160160
}
161161
// mysql >= 5.7
162162
else {
163163
$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
164-
$link->escape_string($data['new']['database_user']),
164+
$link->escape_string($database_user),
165165
$db_host,
166-
$link->escape_string($data['new']['database_password']));
166+
$link->escape_string($database_password));
167167
if(!$link->query($query)) $success = false;
168168
}
169169

@@ -190,17 +190,17 @@ function process_host_list($action, $database_name, $database_user, $database_pa
190190
// mariadb or mysql < 5.7
191191
if($this->getDatabaseType($link) == 'mariadb' || version_compare($this->getDatabaseVersion($link), '5.7', '<')) {
192192
$query = sprintf("SET PASSWORD FOR '%s'@'%s' = '%s'",
193-
$link->escape_string($data['new']['database_user']),
193+
$link->escape_string($database_user),
194194
$db_host,
195-
$link->escape_string($data['new']['database_password']));
195+
$link->escape_string($database_password));
196196
if(!$link->query($query)) $success = false;
197197
}
198198
// mysql >= 5.7
199199
else {
200200
$query = sprintf("ALTER USER IF EXISTS '%s'@'%s' IDENTIFIED WITH mysql_native_password AS '%s'",
201-
$link->escape_string($data['new']['database_user']),
201+
$link->escape_string($database_user),
202202
$db_host,
203-
$link->escape_string($data['new']['database_password']));
203+
$link->escape_string($database_password));
204204
if(!$link->query($query)) $success = false;
205205
}
206206
if($success == true) $link->query("FLUSH PRIVILEGES");

0 commit comments

Comments
 (0)