BUGFIX: Don't make ManifestBuilder choke on empty files. (from r96058) (from r98133)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102605 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 02:15:37 +00:00
parent d743cdef78
commit 83ccc4f6d9

View File

@ -408,7 +408,8 @@ class ManifestBuilder {
$extends = ""; $extends = "";
$class=""; $class="";
if(!$file) user_error("ManifestBuilder::parse_file(): Couldn't open $filename", E_USER_ERROR); if($file === null) user_error("ManifestBuilder::parse_file(): Couldn't open $filename", E_USER_ERROR);
if(!$file) return;
// We cache the parse results of each file, since only a few files will have changed between flushings // We cache the parse results of each file, since only a few files will have changed between flushings
// And, although it's accurate, TokenisedRegularExpression isn't particularly fast // And, although it's accurate, TokenisedRegularExpression isn't particularly fast