tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-04 15:18:39 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Checking for the same combined filename in Requirements::combine_files() to avoid irrelevant error messages

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106225 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-06-07 23:10:56 +00:00 committed by Sam Minnee
parent c38dc3b1b4
commit 25b65b71cf
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/Requirements.php
View File

@ -834,7 +834,7 @@ class Requirements_Backend {
// duplicate check // duplicate check
foreach($this->combine_files as $_combinedFileName => $_files) { foreach($this->combine_files as $_combinedFileName => $_files) {
$duplicates = array_intersect($_files, $files); $duplicates = array_intersect($_files, $files);
if($duplicates) { if($duplicates && $combinedFileName != $_combinedFileName) {
user_error("Requirements_Backend::combine_files(): Already included files " . implode(',', $duplicates) . " in combined file '{$_combinedFileName}'", E_USER_NOTICE); user_error("Requirements_Backend::combine_files(): Already included files " . implode(',', $duplicates) . " in combined file '{$_combinedFileName}'", E_USER_NOTICE);
return false; return false;
} }