gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix coding style for #13737

Browse Source
This commit is contained in:
Michal Čihař 2017-11-28 10:54:42 +01:00
parent 562d0065b0
commit b8428ea70f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/server_privileges.lib.php
View File

@ -1905,19 +1905,17 @@ function PMA_updatePassword($err_url, $username, $hostname)
$local_query = $query_prefix
. $GLOBALS['dbi']->escapeString($_POST['pma_pw']) . "'";
} // MariaDB uses "SET PASSWORD" syntax to change user password.
// On Galera cluster only DDL queries are replicated, since
// users are stored in MyISAM storage engine.
else if ($serverType == 'MariaDB'
&& PMA_MYSQL_INT_VERSION >= 10000
) {
$query_prefix = "SET PASSWORD FOR '"
. $GLOBALS['dbi']->escapeString($username)
. "'@'" . $GLOBALS['dbi']->escapeString($hostname) . "'"
. " = PASSWORD ('";
$local_query = $query_prefix
. $GLOBALS['dbi']->escapeString($_POST['pma_pw']) . "')";
} else if ($serverType == 'MariaDB'
} else if ($serverType == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 10000) {
// MariaDB uses "SET PASSWORD" syntax to change user password.
// On Galera cluster only DDL queries are replicated, since
// users are stored in MyISAM storage engine.
$query_prefix = "SET PASSWORD FOR '"
. $GLOBALS['dbi']->escapeString($username)
. "'@'" . $GLOBALS['dbi']->escapeString($hostname) . "'"
. " = PASSWORD ('";
$local_query = $query_prefix
. $GLOBALS['dbi']->escapeString($_POST['pma_pw']) . "')";
} else if ($serverType == 'MariaDB'
&& PMA_MYSQL_INT_VERSION >= 50200
&& $is_superuser
) {