Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit f764c53c551d298f7e38498c319fa6939bc8a811 1 parent e5083b8
Mark Story markstory authored
Showing with 5 additions and 11 deletions.
  1. +5 −11 cake/libs/inflector.php
16 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'
+ )
);
/**
Please sign in to comment.
Something went wrong with that request. Please try again.