adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverting change to regex greediness.

Browse source
This commit is contained in:
jperras 2009-03-18 02:11:03 -04:00
parent 6068549418
commit a9952e90c1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/inflector.php
View file

@ -288,7 +288,7 @@ class Inflector extends Object {
$_this->singular['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')'; $_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); $_this->singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1);
return $_this->singularized[$word]; return $_this->singularized[$word];
} }