summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-10 06:01:54 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-10 06:01:54 +0100
commit32ab11e289652758947ffb73d7c893c831b64b68 (patch)
tree6f1451f58dabd8b66a777f4e44ce0fa98e4d4549 /system/helpers
parent4b450651ed3b9413be0245401da706c218850f53 (diff)
parenta49de963e27dc066966d587be3adad4bff3483e6 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/string_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 12f818fda..4be7f294b 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -188,7 +188,7 @@ if ( ! function_exists('random_string'))
*
* Useful for generating passwords or hashes.
*
- * @param string type of random string. basic, alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1
+ * @param string type of random string. basic, alpha, alnum, numeric, nozero, unique, md5, encrypt and sha1
* @param int number of characters
* @return string
*/