From 4db5dd3e4729c2bd0719d2208d3184aa1b8b8b67 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 13 Oct 2010 03:31:22 +0000
Subject: [PATCH] MINOR: fixed the error message on class conflict (#5439,
 patch submitted by rorschach) (from r103093)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112119 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/ManifestBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php
index 018c6c6aa..760b41485 100644
--- a/core/ManifestBuilder.php
+++ b/core/ManifestBuilder.php
@@ -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);
 			}