diff options
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/form_helper.php | 1 | ||||
| -rw-r--r-- | system/helpers/inflector_helper.php | 52 | ||||
| -rw-r--r-- | system/helpers/smiley_helper.php | 1 | ||||
| -rw-r--r-- | system/helpers/text_helper.php | 2 | ||||
| -rw-r--r-- | system/helpers/url_helper.php | 2 |
5 files changed, 28 insertions, 30 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index e7bea92cc..c7e6d4933 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -814,7 +814,6 @@ if ( ! function_exists('set_radio')) // ------------------------------------------------------------------------ - if ( ! function_exists('form_error')) { /** diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index 59cb296b2..68af820c5 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -58,33 +58,33 @@ if ( ! function_exists('singular')) } $singular_rules = array( - '/(matr)ices$/' => '\1ix', - '/(vert|ind)ices$/' => '\1ex', - '/^(ox)en/' => '\1', - '/(alias)es$/' => '\1', - '/([octop|vir])i$/' => '\1us', - '/(cris|ax|test)es$/' => '\1is', - '/(shoe)s$/' => '\1', - '/(o)es$/' => '\1', - '/(bus|campus)es$/' => '\1', - '/([m|l])ice$/' => '\1ouse', - '/(x|ch|ss|sh)es$/' => '\1', - '/(m)ovies$/' => '\1\2ovie', - '/(s)eries$/' => '\1\2eries', - '/([^aeiouy]|qu)ies$/' => '\1y', - '/([lr])ves$/' => '\1f', - '/(tive)s$/' => '\1', - '/(hive)s$/' => '\1', - '/([^f])ves$/' => '\1fe', - '/(^analy)ses$/' => '\1sis', + '/(matr)ices$/' => '\1ix', + '/(vert|ind)ices$/' => '\1ex', + '/^(ox)en/' => '\1', + '/(alias)es$/' => '\1', + '/([octop|vir])i$/' => '\1us', + '/(cris|ax|test)es$/' => '\1is', + '/(shoe)s$/' => '\1', + '/(o)es$/' => '\1', + '/(bus|campus)es$/' => '\1', + '/([m|l])ice$/' => '\1ouse', + '/(x|ch|ss|sh)es$/' => '\1', + '/(m)ovies$/' => '\1\2ovie', + '/(s)eries$/' => '\1\2eries', + '/([^aeiouy]|qu)ies$/' => '\1y', + '/([lr])ves$/' => '\1f', + '/(tive)s$/' => '\1', + '/(hive)s$/' => '\1', + '/([^f])ves$/' => '\1fe', + '/(^analy)ses$/' => '\1sis', '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis', - '/([ti])a$/' => '\1um', - '/(p)eople$/' => '\1\2erson', - '/(m)en$/' => '\1an', - '/(s)tatuses$/' => '\1\2tatus', - '/(c)hildren$/' => '\1\2hild', - '/(n)ews$/' => '\1\2ews', - '/([^us])s$/' => '\1', + '/([ti])a$/' => '\1um', + '/(p)eople$/' => '\1\2erson', + '/(m)en$/' => '\1an', + '/(s)tatuses$/' => '\1\2tatus', + '/(c)hildren$/' => '\1\2hild', + '/(n)ews$/' => '\1\2ews', + '/([^us])s$/' => '\1' ); foreach ($singular_rules as $rule => $replacement) diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 4b491758e..7293999fe 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -120,7 +120,6 @@ EOF; // ------------------------------------------------------------------------ - if ( ! function_exists('get_clickable_smileys')) { /** diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index cce659231..705238704 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -139,7 +139,7 @@ if ( ! function_exists('ascii_to_entities')) */ if (count($temp) === 1) { - $out .= '&#'.array_shift($temp).';'; + $out .= '&#'.array_shift($temp).';'; $count = 1; } diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 0aa358a0b..14c216afe 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -293,7 +293,7 @@ if ( ! function_exists('safe_mailto')) { foreach ($attributes as $key => $val) { - $x[] = ' '.$key.'="'; + $x[] = ' '.$key.'="'; for ($i = 0, $l = strlen($val); $i < $l; $i++) { $x[] = '|'.ord($val[$i]); |