Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Attempting to get passing builds on travisci"

This reverts commit 61d6f71.
  • Loading branch information...
commit 8bbb1f166c1e974796bccffeddf0701a8551a88e 1 parent 61d6f71
@markstory markstory authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  lib/Cake/Utility/Security.php
View
3  lib/Cake/Utility/Security.php
@@ -272,8 +272,7 @@ protected static function _crypt($password, $type = null, $salt = false) {
$salt,
);
$salt = vsprintf($saltFormat[$hashType], $vspArgs);
- }
- if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 12) {
+ } elseif ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
trigger_error(__d(
'cake_dev',
'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',
Please sign in to comment.
Something went wrong with that request. Please try again.