Permalink
Browse files

Removing Inflector's inheritance on Object, as it was unecessary.

Adding irregular waves => wave missed in merge from 1.2
  • Loading branch information...
1 parent e5083b8 commit f764c53c551d298f7e38498c319fa6939bc8a811 @markstory markstory committed Sep 16, 2009
Showing with 5 additions and 11 deletions.
  1. +5 −11 cake/libs/inflector.php
View
@@ -21,14 +21,6 @@
*/
/**
- * Included libraries.
- *
- */
-if (!class_exists('Object')) {
- require_once(LIBS . 'object.php');
-}
-
-/**
* Pluralize and singularize English words.
*
* Inflector pluralizes and singularizes English nouns.
@@ -38,7 +30,7 @@
* @subpackage cake.cake.libs
* @link http://book.cakephp.org/view/491/Inflector
*/
-class Inflector extends Object {
+class Inflector {
/**
* Plural inflector rules
@@ -152,8 +144,10 @@ class Inflector extends Object {
),
'uninflected' => array(
'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
- ),
- 'irregular' => array()
+ ),
+ 'irregular' => array(
+ 'waves' => 'wave'
+ )
);
/**

0 comments on commit f764c53

Please sign in to comment.