Revert "Attempting to get passing builds on travisci"

This reverts commit 61d6f716bc.
This commit is contained in:
mark_story 2012-09-26 21:58:14 -04:00
parent 61d6f716bc
commit 8bbb1f166c

View file

@ -272,8 +272,7 @@ class Security {
$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.',