diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
| commit | 94c6b1f1c02466178c1f8e144542d753f27dd3d8 (patch) | |
| tree | 8e8ca4b8383e2481b0a689fd07fc230013531822 /user_guide_src/source/helpers/security_helper.rst | |
| parent | 6581cac4d2b5fef69478ce1a5c3464200bfcbba5 (diff) | |
| parent | c78e56a7df140ee777ffc67687877f3e70c77e28 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'user_guide_src/source/helpers/security_helper.rst')
| -rw-r--r-- | user_guide_src/source/helpers/security_helper.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst index b1bcf2b4a..ec0be28b3 100644 --- a/user_guide_src/source/helpers/security_helper.rst +++ b/user_guide_src/source/helpers/security_helper.rst @@ -43,8 +43,10 @@ for a full list of supported algorithms. $str = do_hash($str); // SHA1 $str = do_hash($str, 'md5'); // MD5 -.. note:: This function was formerly named dohash(), which has been - removed in favor of `do_hash()`. +.. note:: This function was formerly named ``dohash()``, which has been + removed in favor of ``do_hash()``. + +.. note:: This function is DEPRECATED. Use the native ``hash()`` instead. strip_image_tags() ================== |