mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR: fixed the error message on class conflict (#5439, patch submitted by rorschach)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103093 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
2889e57590
commit
f410107b40
@ -456,7 +456,7 @@ class ManifestBuilder {
|
||||
|
||||
if(isset(self::$classArray[$className])) {
|
||||
$file1 = self::$classArray[$className]['file'];
|
||||
$file2 = $class[$className];
|
||||
$file2 = $class['file'];
|
||||
user_error("There are two files both containing the same class: '$file1' and " .
|
||||
"'$file2'. This might mean that the wrong code is being used.", E_USER_WARNING);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user