diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
| commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
| tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /system/helpers/string_helper.php | |
| parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
| parent | 4b9c62980599228f070b401c7673dce8085b0c61 (diff) | |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'system/helpers/string_helper.php')
| -rw-r--r-- | system/helpers/string_helper.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 9f730bd10..7765bba31 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * @@ -150,7 +150,7 @@ if ( ! function_exists('reduce_double_slashes')) /** * Reduce Multiples * - * Reduces multiple instances of a particular character. Example: + * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * @@ -187,7 +187,7 @@ if ( ! function_exists('reduce_multiples')) * Useful for generating passwords or hashes. * * @access public - * @param string type of random string. basic, alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1 + * @param string type of random string. basic, alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1 * @param integer number of characters * @return string */ @@ -245,7 +245,7 @@ if ( ! function_exists('random_string')) /** * Alternator * - * Allows strings to be alternated. See docs... + * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) |