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)); }