diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-31 15:44:02 +0100 |
| commit | 3ccc386be4e0e1e4b3d47f1785e11d4b8613ef72 (patch) | |
| tree | f1c8cd29775537b8da76143edeec5b6c8d659550 /system/helpers/security_helper.php | |
| parent | a9a1d2520493211ca35f7ab56866d0e154afc1c3 (diff) | |
| parent | f2b19fee7876708c7a7bb5cba6b7df682a9d2a53 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/helpers/security_helper.php')
| -rw-r--r-- | system/helpers/security_helper.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 5ecc960bc..8bbd06684 100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php @@ -77,12 +77,10 @@ if ( ! function_exists('do_hash')) /** * Hash encode a string * - * This function is DEPRECATED and should be removed in - * CodeIgniter 3.1+. Use hash() instead. - * - * @deprecated - * @param string - * @param string + * @todo Remove in version 3.1+. + * @deprecated 3.0.0 Use PHP's native hash() instead. + * @param string $str + * @param string $type = 'sha1' * @return string */ function do_hash($str, $type = 'sha1') |