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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-06-15 01:15:30 +02:00
commit 8bdf30ef1c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
user_password.php
View File

@ -40,9 +40,9 @@ if (isset($_REQUEST['nopass'])) {
$password = $_REQUEST['pma_pw'];
}
$change_password_message = PMA_setChangePasswordMsg();
$message = $change_password_message['msg'];
$msg = $change_password_message['msg'];
if (! $change_password_message['error']) {
PMA_changePassword($password, $message, $change_password_message);
PMA_changePassword($password, $msg, $change_password_message);
} else {
PMA_getChangePassMessage($change_password_message);
}
@ -54,9 +54,9 @@ if (isset($_REQUEST['nopass'])) {
*/
// Displays an error message if required
if (isset($message)) {
$message->display();
unset($message);
if (isset($msg)) {
$msg->display();
unset($msg);
}
require_once './libraries/display_change_password.lib.php';