diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
| commit | 93ca71552d9a3e28eeaa00dd10755d20b2cbf32e (patch) | |
| tree | 660233f2ec631e5730731491d2fd244fe15f7df8 /system/helpers/inflector_helper.php | |
| parent | a9924b8352aa18869677bea0182c45e2a7e2ce37 (diff) | |
| parent | 2f8b27efeb0a39c24eddf89cf31ea0fd113a6b71 (diff) | |
Merged recent Core changes and fixed conflict.
Diffstat (limited to 'system/helpers/inflector_helper.php')
| -rw-r--r-- | system/helpers/inflector_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index ed9ab5f9d..4cd7486b4 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -93,7 +93,7 @@ if ( ! function_exists('plural')) } elseif ($end == 'h') { - if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh') + if (substr($str, -2) == 'ch' OR substr($str, -2) == 'sh') { $str .= 'es'; } |