Reverting change to regex greediness.

jperras · jperras · commit a9952e90c13e · 2009-03-18T02:11:03.000-04:00
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
@@ -288,7 +288,7 @@ function singularize($word) {
         	$_this->singular['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')';
 		}
 
-		if (preg_match('/(.+?)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) {
+		if (preg_match('/(.*)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) {
 			$_this->singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1);
 			return $_this->singularized[$word];
 		}

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ function singularize($word) {`
`288`	`288`	`$_this->singular['cacheIrregular'] = '(?:' . join( '\|', array_keys($irregular)) . ')';`
`289`	`289`	`}`
`290`	`290`
`291`		`- if (preg_match('/(.+?)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) {`
	`291`	`+ if (preg_match('/(.*)\\b(' . $_this->singular['cacheIrregular'] . ')$/i', $word, $regs)) {`
`292`	`292`	`$_this->singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1);`
`293`	`293`	`return $_this->singularized[$word];`
`294`	`294`	`}`