diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-16 20:03:49 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-16 20:03:49 +0100 |
| commit | 33ed0f37b6b8f2223cd3362bf8fca28102ab67c6 (patch) | |
| tree | 99c613720a2fd8541764bb6fc893e0da28fa269b /system/helpers/inflector_helper.php | |
| parent | 154da11c5bb4b7dc5c225f4fa018852ee45cc6eb (diff) | |
| parent | d8d1e24eee56d2466c91ecd72b3c8932eb3d0639 (diff) | |
Merged CodeIgniter Core changes and integrated rob1's secure cookie change into my secure cookie change.
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'; } |