From 59b4ab4550acd2a6d548d4a201c99eae7f358854 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 8 Mar 2010 04:32:32 +0000 Subject: [PATCH] BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100614 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Requirements.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/Requirements.php b/core/Requirements.php index 687bd5943..f166f1344 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -702,7 +702,7 @@ class Requirements_Backend { $path = $this->path_for_file($file); if($path) $jsRequirements[] = $path; } - + $response->addHeader('X-Include-JS', implode(',', $jsRequirements)); foreach(array_diff_key($this->css,$this->blocked) as $file => $params) { @@ -912,9 +912,10 @@ class Requirements_Backend { $base = Director::baseFolder() . '/'; foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) { $fileList = $this->combine_files[$combinedFile]; + $combinedFilePath = $base . '/' . $combinedFilesFolder . '/' . $combinedFile; // Determine if we need to build the combined include - if(file_exists($base . $combinedFile) && !isset($_GET['flush'])) { + if(file_exists($combinedFilePath) && !isset($_GET['flush'])) { // file exists, check modification date of every contained file $srcLastMod = 0; foreach($fileList as $file) {