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

Adding fix for #2435. Fixes issues with custom inflection rules not being used before the default rules

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4919 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-04-29 08:41:46 +00:00
parent 87cfb1766d
commit 027f7838b5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cake/libs/inflector.php
View file

@ -144,9 +144,9 @@ class Inflector extends Object {
if (file_exists(CONFIGS . 'inflections.php')) {
include(CONFIGS.'inflections.php');
$pluralRules = Set::pushDiff($corePluralRules, $pluralRules);
$uninflected = Set::pushDiff($coreUninflectedPlural, $uninflectedPlural);
$irregular = Set::pushDiff($coreIrregularPlural, $irregularPlural);
$pluralRules = Set::pushDiff($pluralRules, $corePluralRules);
$uninflected = Set::pushDiff($uninflectedPlural, $coreUninflectedPlural);
$irregular = Set::pushDiff($irregularPlural, $coreIrregularPlural);
}
$_this->pluralRules = array('pluralRules' => $pluralRules, 'uninflected' => $uninflected, 'irregular' => $irregular);
$_this->pluralized = array();
@ -283,9 +283,9 @@ class Inflector extends Object {
if (file_exists(CONFIGS . 'inflections.php')) {
include(CONFIGS.'inflections.php');
$singularRules = Set::pushDiff($coreSingularRules, $singularRules);
$uninflected = Set::pushDiff($coreUninflectedSingular, $uninflectedSingular);
$irregular = Set::pushDiff($coreIrregularSingular, $irregularSingular);
$singularRules = Set::pushDiff($singularRules, $coreSingularRules);
$uninflected = Set::pushDiff($uninflectedSingular, $coreUninflectedSingular);
$irregular = Set::pushDiff($irregularSingular, $coreIrregularSingular);
}
$_this->singularRules = array('singularRules' => $singularRules, 'uninflected' => $uninflected, 'irregular' => $irregular);
$_this->singularized = array();