diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:32:39 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 12:32:39 +0200 |
| commit | 189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1 (patch) | |
| tree | 8ee2c6efc76f73dbf064c6aa4be99bff79a36b81 /phpBB | |
| parent | acd72fad7b907faa3d66eef14996d409dc58e581 (diff) | |
| parent | 020106eeb9295d4bfd31bf6672f9508b0c1d1d54 (diff) | |
| download | forums-189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1.tar forums-189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1.tar.gz forums-189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1.tar.bz2 forums-189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1.tar.xz forums-189bd6dc9be3a1fbf8b5d72ea6ffa50bba89e6c1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
Diffstat (limited to 'phpBB')
| -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 9bcf1b20db..ac95e3709d 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)) |