diff options
| author | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
|---|---|---|
| committer | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
| commit | cc7c7c691ad16beb5040a8a1d07064e61b5e2167 (patch) | |
| tree | f0ed98dc9f580bf38cfb13b72d8ab2cddfd69a3f /system/libraries/Encrypt.php | |
| parent | 58dfc089bf5b0ca35c2ff244e5bfdff726f9adcd (diff) | |
| parent | 6123b61e8ec95ac91f67bfbf442e34021c922319 (diff) | |
update devel version
Diffstat (limited to 'system/libraries/Encrypt.php')
| -rw-r--r-- | system/libraries/Encrypt.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 8ffd93aea..679609251 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -484,7 +484,7 @@ class CI_Encrypt { */ public function set_hash($type = 'sha1') { - $this->_hash_type = ($type !== 'sha1' && $type !== 'md5') ? 'sha1' : $type; + $this->_hash_type = in_array($type, hash_algos()) ? $type : 'sha1'; } // -------------------------------------------------------------------- @@ -497,7 +497,7 @@ class CI_Encrypt { */ public function hash($str) { - return ($this->_hash_type === 'sha1') ? sha1($str) : md5($str); + return hash($this->_hash_type, $str); } } |