Fix singularization of databases.

Fixes #2822
cakephp · Apr 24, 2012 · 1346893 · 1346893
1 parent 3627512
commit 1346893
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -108,6 +108,7 @@ public function testInflectingSingulars() {
 		$this->assertEquals(Inflector::singularize('cafes'), 'cafe');
 		$this->assertEquals(Inflector::singularize('roofs'), 'roof');
 		$this->assertEquals(Inflector::singularize('foes'), 'foe');
+		$this->assertEquals(Inflector::singularize('databases'), 'database');
 
 		$this->assertEquals(Inflector::singularize(''), '');
 	}

diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
@@ -124,7 +124,7 @@ class Inflector {
 			'/(drive)s$/i' => '\1',
 			'/([^fo])ves$/i' => '\1fe',
 			'/(^analy)ses$/i' => '\1sis',
-			'/(analy|ba|diagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
 			'/([ti])a$/i' => '\1um',
 			'/(p)eople$/i' => '\1\2erson',
 			'/(m)en$/i' => '\1an',