From 027f7838b5fe1db617e324a360ca53d954f980bd Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sun, 29 Apr 2007 08:41:46 +0000
Subject: [PATCH] Adding fix for #2435. Fixes issues with custom inflection
 rules not being used before the default rules

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4919 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/inflector.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index dc0ee0ade..c40ff5eed 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -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();