From e07801354738366e2a6b836479e8c1f1c9429613 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 8 Mar 2010 04:35:35 +0000 Subject: [PATCH] MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100615 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Requirements.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/Requirements.php b/core/Requirements.php index f166f1344..44379badd 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -912,7 +912,7 @@ 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; + $combinedFilePath = $base . '/' . $this->combinedFilesFolder . '/' . $combinedFile; // Determine if we need to build the combined include if(file_exists($combinedFilePath) && !isset($_GET['flush'])) { @@ -945,7 +945,6 @@ class Requirements_Backend { $combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n".($isJS ? ';' : '')."\n"; } - $combinedFilePath = Director::baseFolder() . '/' . $this->combinedFilesFolder . '/' . $combinedFile; if(!file_exists(dirname($combinedFilePath))) { Filesystem::makeFolder(dirname($combinedFilePath)); }