tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR: fixed the error message on class conflict (#5439, patch submitted by rorschach) (from r103093)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112119 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 03:31:22 +00:00
parent eef3ff8021
commit 4db5dd3e47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ManifestBuilder.php
View File

@ -456,7 +456,7 @@ class ManifestBuilder {
if(isset(self::$classArray[$className])) { if(isset(self::$classArray[$className])) {
$file1 = self::$classArray[$className]['file']; $file1 = self::$classArray[$className]['file'];
$file2 = $class[$className]; $file2 = $class['file'];
user_error("There are two files both containing the same class: '$file1' and " . 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); "'$file2'. This might mean that the wrong code is being used.", E_USER_WARNING);
} }