Merge branch 'QA_4_5'

Conflicts:
	server_privileges.php
This commit is contained in:
Madhura Jayaratne 2015-10-27 08:12:53 +11:00
commit 4d4cb9a5c2
2 changed files with 8 additions and 2 deletions

View File

@ -17,6 +17,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

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