adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
This commit is contained in:
Jose Lorenzo Rodriguez 2012-09-25 16:36:03 +02:00
commit d5c9d97dc1
43 changed files with 343 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/Cake/Utility/Debugger.php
View file

@ -213,7 +213,6 @@ class Debugger {
if (empty($line)) {
$line = '??';
}
$path = self::trimPath($file);
$info = compact('code', 'description', 'file', 'line');
if (!in_array($info, $self->errors)) {