Revert "Attempting to get passing builds on travisci"

This reverts commit 61d6f71.
cakephp · Sep 27, 2012 · 8bbb1f1 · 8bbb1f1
1 parent 61d6f71
commit 8bbb1f1
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/Cake/Utility/Security.php b/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.',