diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-22 21:25:00 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-22 21:25:00 -0400 |
| commit | 200c7e3c446aaa95397ac379f6eb2aa3b620ccd6 (patch) | |
| tree | 660332c4e2bfa81bbafd9783909f2264acae3e8d /phpBB/includes/functions.php | |
| parent | 51fb493edcbe4c70728610662859f78f920cdc55 (diff) | |
| parent | 4c3cc152c81af57ec0a25bfee5da4964309a3aa5 (diff) | |
| download | forums-200c7e3c446aaa95397ac379f6eb2aa3b620ccd6.tar forums-200c7e3c446aaa95397ac379f6eb2aa3b620ccd6.tar.gz forums-200c7e3c446aaa95397ac379f6eb2aa3b620ccd6.tar.bz2 forums-200c7e3c446aaa95397ac379f6eb2aa3b620ccd6.tar.xz forums-200c7e3c446aaa95397ac379f6eb2aa3b620ccd6.zip | |
Merge branch 'ticket/igorw/10101' into develop-olympus
* ticket/igorw/10101:
[ticket/10101] Add test case for native phpass hashes
[ticket/10101] Add support for native phpass hashes
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 198e429afc..585e23b2ee 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -516,7 +516,7 @@ function _hash_crypt_private($password, $setting, &$itoa64) $output = '*'; // Check for correct hash - if (substr($setting, 0, 3) != '$H$') + if (substr($setting, 0, 3) != '$H$' && substr($setting, 0, 3) != '$P$') { return $output; } |