diff options
| author | Gerry Weißbach <gerry.w@gammaproduction.de> | 2015-05-07 11:32:29 +0200 |
|---|---|---|
| committer | Gerry Weißbach <gerry.w@gammaproduction.de> | 2015-05-07 11:32:29 +0200 |
| commit | d2d5fb4254e659561b6bae97cfd9ed2bdad73aa6 (patch) | |
| tree | d6b1ec7d36c8861e716554533c2fd59156b94c09 /inc/PassHash.class.php | |
| parent | c594265e447bf705dae05f5e59560ea4c3afea0b (diff) | |
| parent | 9234bce90e1297ac66acc321827cb0f832864fe4 (diff) | |
| download | rpg-d2d5fb4254e659561b6bae97cfd9ed2bdad73aa6.tar.gz rpg-d2d5fb4254e659561b6bae97cfd9ed2bdad73aa6.tar.bz2 | |
Merge commit '9234bce90e1297ac66acc321827cb0f832864fe4' into extension_manager
Diffstat (limited to 'inc/PassHash.class.php')
| -rw-r--r-- | inc/PassHash.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php index 15f896dcf..0701c4116 100644 --- a/inc/PassHash.class.php +++ b/inc/PassHash.class.php @@ -50,7 +50,7 @@ class PassHash { } elseif(preg_match('/^md5\$(.{5})\$/', $hash, $m)) { $method = 'djangomd5'; $salt = $m[1]; - } elseif(preg_match('/^\$2a\$(.{2})\$/', $hash, $m)) { + } elseif(preg_match('/^\$2(a|y)\$(.{2})\$/', $hash, $m)) { $method = 'bcrypt'; $salt = $hash; } elseif(substr($hash, 0, 6) == '{SSHA}') { |