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

This commit is contained in:
Weblate 2015-10-26 22:10:07 +01:00
commit aa770c3de5
2 changed files with 8 additions and 1 deletions

View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- issue #11590 Parser: Array to string conversion
- issue #11597 Huge binary log growth on 4.5.x
- issue #11594 'only_db' config option bug when db names contain underscore and are grouped
- issue #11607 Unable to change password from Login information tab
4.5.1.0 (2015-10-23)
- issue Invalid argument supplied for foreach()

View File

@ -137,7 +137,13 @@ if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
&& $hostname == $_REQUEST['old_hostname']
) {
$response->addHTML(
PMA_Message::error(__('Username and hostname didn\'t change.'))->getDisplay()
PMA_Message::error(
__(
"Username and hostname didn't change. "
. "If you only want to change the password, "
. "'Change password' tab should be used."
)
)->getDisplay()
);
$response->isSuccess(false);
exit;