diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-14 11:51:36 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-14 11:51:36 +0100 |
| commit | 15a29e11a1003ff253b4df7c8a4c6e97b052a06d (patch) | |
| tree | 8297ecf0727c574bd90cb12413f687f8413dce2e /system/helpers/inflector_helper.php | |
| parent | 0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (diff) | |
| parent | ce707b4cafd64b95031690cf927584b1d60c7ad7 (diff) | |
Merged unit test progress.
Diffstat (limited to 'system/helpers/inflector_helper.php')
| -rw-r--r-- | system/helpers/inflector_helper.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index ad9cd1fbd..485806b20 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -25,8 +25,6 @@ * @filesource */ -// ------------------------------------------------------------------------ - /** * CodeIgniter Inflector Helpers * @@ -37,7 +35,6 @@ * @link http://codeigniter.com/user_guide/helpers/inflector_helper.html */ - // -------------------------------------------------------------------- /** @@ -58,7 +55,7 @@ if ( ! function_exists('singular')) { return $result; } - + $singular_rules = array( '/(matr)ices$/' => '\1ix', '/(vert|ind)ices$/' => '\1ex', @@ -116,7 +113,7 @@ if ( ! function_exists('singular')) if ( ! function_exists('plural')) { function plural($str, $force = FALSE) - { + { $result = strval($str); if ( ! is_countable($result)) @@ -145,7 +142,7 @@ if ( ! function_exists('plural')) '/s$/' => 's', // no change (compatibility) '/$/' => 's', ); - + foreach ($plural_rules as $rule => $replacement) { if (preg_match($rule, $result)) @@ -232,4 +229,4 @@ if ( ! function_exists('is_countable')) } /* End of file inflector_helper.php */ -/* Location: ./system/helpers/inflector_helper.php */
\ No newline at end of file +/* Location: ./system/helpers/inflector_helper.php */ |