tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is

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

3
core/Requirements.php
View File

@ -912,7 +912,7 @@ class Requirements_Backend {
$base = Director::baseFolder() . '/'; $base = Director::baseFolder() . '/';
foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) { foreach(array_diff_key($combinedFiles, $this->blocked) as $combinedFile => $dummy) {
$fileList = $this->combine_files[$combinedFile]; $fileList = $this->combine_files[$combinedFile];
$combinedFilePath = $base . '/' . $combinedFilesFolder . '/' . $combinedFile; $combinedFilePath = $base . '/' . $this->combinedFilesFolder . '/' . $combinedFile;
// Determine if we need to build the combined include // Determine if we need to build the combined include
if(file_exists($combinedFilePath) && !isset($_GET['flush'])) { if(file_exists($combinedFilePath) && !isset($_GET['flush'])) {
@ -945,7 +945,6 @@ class Requirements_Backend {
$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n".($isJS ? ';' : '')."\n"; $combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n".($isJS ? ';' : '')."\n";
} }
$combinedFilePath = Director::baseFolder() . '/' . $this->combinedFilesFolder . '/' . $combinedFile;
if(!file_exists(dirname($combinedFilePath))) { if(!file_exists(dirname($combinedFilePath))) {
Filesystem::makeFolder(dirname($combinedFilePath)); Filesystem::makeFolder(dirname($combinedFilePath));
} }