Changeset 2971

Timestamp:

07/06/2008 06:46:21 PM (5 months ago)

Author:

Shadowhand

Message:

Fixing #672, thanks s_brightsky!

Files:

• trunk/system/helpers/inflector.php (modified) (1 diff)

trunk/system/helpers/inflector.php

@@ -80 +80 @@
                         $str = $irregular;
                 }
-                elseif (substr($str, -3) === 'ies')
-                {
-                        $str = substr($str, 0, strlen($str) - 3).'y';
-                }
-                elseif (substr($str, -4) === 'sses' OR substr($str, -3) === 'xes')
-                {
-                        $str = substr($str, 0, strlen($str) - 2);
+                elseif (preg_match('/[sxz]es$/i', $str) OR preg_match('/[^aeioudgkprt]hes$/i', $str))
+                {
+                        // Remove "es"
+                        $str = substr($str, 0, -2);
+                }
+                elseif (preg_match('/[^aeiou]ies$/i', $str))
+                {
+                        // Remove "ies"
+                        $str = substr($str, 0, -3).'y';
                 }
                 elseif (substr($str, -1) === 's')
                 {
+                        // Remove "s"
                         $str = substr($str, 0, strlen($str) - 1);
                 }