diff options
| author | patdenice <patdenice@piwigo.org> | 2013-11-21 22:32:04 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2013-11-21 22:32:04 +0000 |
| commit | f4089737e0760e9d790acd34434ba34b561965f9 (patch) | |
| tree | fa54fe7863d172c7e3ef69eb4ec64636a0b936c9 | |
| parent | df56834db44c617a8cfedbc56d0fb7b6be1f8c44 (diff) | |
merge r25633 from trunk to branch 2.5
Small bug on password hash verification with strpos function
git-svn-id: http://piwigo.org/svn/branches/2.5@25634 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/functions_user.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 50467e909..e1aa9e82d 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -1171,7 +1171,7 @@ function pwg_password_verify($password, $hash, $user_id=null) global $conf, $pwg_hasher; // If the password has not been hashed with the current algorithm. - if (strpos('$P', $hash) !== 0) + if (strpos($hash, '$P') !== 0) { if (!empty($conf['pass_convert'])) { |