MDL-11789 fixed regressions preventing file caching when default used; merged from MOODLE_19_STABLE

This commit is contained in:
skodak 2008-11-01 19:28:31 +00:00
parent a857b7ea38
commit 0cde3ede1c

View File

@ -973,9 +973,9 @@ function send_file($path, $filename, $lifetime = 'default' , $filter=0, $pathiss
// MDL-11789, apply $CFG->filelifetime here
if ($lifetime === 'default') {
if (!empty($CFG->filelifetime)) {
$filetime = $CFG->filelifetime;
$lifetime = $CFG->filelifetime;
} else {
$filetime = 86400;
$lifetime = 86400;
}
}