adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 03:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.4

Browse source 
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
This commit is contained in:
mark_story 2013-07-03 14:21:09 -04:00
commit c597855fe4
59 changed files with 484 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Utility/Inflector.php
View file

@ -308,7 +308,7 @@ class Inflector {
} else {
self::$_transliteration = $rules + self::$_transliteration;
}
break;
break;
default:
foreach ($rules as $rule => $pattern) {
@ -334,7 +334,6 @@ class Inflector {
}
}
self::${$var}['rules'] = $rules + self::${$var}['rules'];
break;
}
}