tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 09:59:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG If combined files can't be written, fallback instantly to uncombined

Browse Source
This commit is contained in:
Sean Harvey 2012-09-20 14:00:11 +12:00
parent d0153f32cf
commit 954eb60983
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/Requirements.php
View File

@ -998,12 +998,13 @@ class Requirements_Backend {
Filesystem::makeFolder(dirname($combinedFilePath)); Filesystem::makeFolder(dirname($combinedFilePath));
} }
// If the file isn't writebale, don't even bother trying to make the combined file // If the file isn't writeable, don't even bother trying to make the combined file and return (falls back to uncombined)
// Complex test because is_writable fails if the file doesn't exist yet. // Complex test because is_writable fails if the file doesn't exist yet.
if((file_exists($combinedFilePath) && !is_writable($combinedFilePath)) || if((file_exists($combinedFilePath) && !is_writable($combinedFilePath))
(!file_exists($combinedFilePath) && !is_writable(dirname($combinedFilePath)))) { || (!file_exists($combinedFilePath) && !is_writable(dirname($combinedFilePath)))
) {
user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING); user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'", E_USER_WARNING);
continue; return false;
} }
// Determine if we need to build the combined include // Determine if we need to build the combined include