diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:32:25 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:32:25 +0200 |
| commit | 020106eeb9295d4bfd31bf6672f9508b0c1d1d54 (patch) | |
| tree | 521a3f5c2029b38ee44caab24ffd443d8d60aeeb | |
| parent | 17451e0842de01a702f8b6e3cc539983ec3f3a0a (diff) | |
| parent | ba1464b6e039f558b751c0631f8b5fd2c6c23a3e (diff) | |
| download | forums-020106eeb9295d4bfd31bf6672f9508b0c1d1d54.tar forums-020106eeb9295d4bfd31bf6672f9508b0c1d1d54.tar.gz forums-020106eeb9295d4bfd31bf6672f9508b0c1d1d54.tar.bz2 forums-020106eeb9295d4bfd31bf6672f9508b0c1d1d54.tar.xz forums-020106eeb9295d4bfd31bf6672f9508b0c1d1d54.zip | |
Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus
* bantu/ticket/10421:
[ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 789003e31b..abf1481000 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -818,7 +818,7 @@ class acp_users // Which updates do we need to do? $update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false; - $update_password = ($data['new_password'] && !phpbb_check_hash($user_row['user_password'], $data['new_password'])) ? true : false; + $update_password = ($data['new_password'] && !phpbb_check_hash($data['new_password'], $user_row['user_password'])) ? true : false; $update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false; if (!sizeof($error)) |