From 13468937cce7869990d017eadfecf6e5a859cc99 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 23 Apr 2012 20:50:11 -0400 Subject: [PATCH] Fix singularization of databases. Fixes #2822 --- lib/Cake/Test/Case/Utility/InflectorTest.php | 1 + lib/Cake/Utility/Inflector.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index 9709b03d209..d5683680ac6 100644 --- 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 index aff1627f1b6..7cfc04aa26b 100644 --- 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',