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

diff --git a/lib/filelib.php b/lib/filelib.php
index d4f52abdf7de99aefd8451d5435683ed206546a6..e801bdd05267ec36fbdc15d5e8484b8a4f70c182 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -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;
         }
     }