Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-02-26 03:21:47 +01:00
commit 78be1555c0

View File

@ -4739,7 +4739,8 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
. '</h2>' . "\n";
$password_column = 'Password';
if (Util::getServerType() == 'MySQL'
$server_type = Util::getServerType();
if (($server_type == 'MySQL' || $server_type == 'Percona Server')
&& PMA_MYSQL_INT_VERSION >= 50706
) {
$password_column = 'authentication_string';