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

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-10-13 17:15:12 +02:00
commit 649591da8d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/server_privileges.lib.php
View File

@ -1442,9 +1442,20 @@ function PMA_getHtmlForAuthPluginsDropdown(
if ($plugin['PLUGIN_NAME'] == 'mysql_old_password') {
continue;
}
// if description is known, enable its translation
if ('Native MySQL authentication' == $plugin['PLUGIN_DESCRIPTION']) {
$description = __('Native MySQL authentication');
} elseif ('SHA256 password authentication' == $plugin['PLUGIN_DESCRIPTION']) {
$description = __('SHA256 password authentication');
} else {
// but there can be other auth plugins, see
// https://github.com/phpmyadmin/phpmyadmin/issues/11561
$description = $plugin['PLUGIN_DESCRIPTION'];
}
$html_output .= '<option value="' . $plugin['PLUGIN_NAME'] . '"'
. ($orig_auth_plugin == $plugin['PLUGIN_NAME'] ? 'selected ' : '')
. '>' . __($plugin['PLUGIN_DESCRIPTION']) . '</option>';
. '>' . $description . '</option>';
}
$html_output .= '</select>';
} else {