tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-21 02:43:58 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100614 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-03-08 04:32:32 +00:00 committed by Sam Minnee
parent b35fb2b5ad
commit 59b4ab4550
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Requirements.php
View File

@ -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) {