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

Fixing typo.

Browse source
This commit is contained in:
jperras 2009-03-18 01:42:22 -04:00
parent b563393752
commit f811a69c87
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/inflector.php
View file

@ -236,6 +236,7 @@ class Inflector extends Object {
if (isset($_this->pluralized[$word])) {
return $_this->pluralized[$word];
}
extract($_this->plural);
$uninflected = array_merge($uninflected, $_this->uninflected);
@ -244,7 +245,7 @@ class Inflector extends Object {
$_this->plural['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')';
}
if (preg_match('/(.+?)\\b(' . $_this->plural['cacheIrregular'] . ')$/i', $word, $regs)) {
if (preg_match('/(.*)\\b(' . $_this->plural['cacheIrregular'] . ')$/i', $word, $regs)) {
$_this->pluralized[$word] = $regs[1] . substr($word, 0, 1) . substr($irregular[strtolower($regs[2])], 1);
return $_this->pluralized[$word];
}
@ -287,7 +288,7 @@ class Inflector extends Object {
$_this->singular['cacheIrregular'] = '(?:' . join( '|', array_keys($irregular)) . ')';
}
if (preg_match('/(.+?)\\b(' . $_this->singular['cacheUninflected'] . ')$/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];
}