Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle

Conflicts: version.php
2014-12-04 11:37:48 +00:00
parent 7b58b245bf c35d736a44
commit f9fae51704
4 changed files with 17 additions and 2 deletions
@@ -46,7 +46,7 @@ class file_temp_cleanup_task extends scheduled_task {

        $tmpdir = $CFG->tempdir;
        // Default to last weeks time.
-        $time = strtotime('-1 week');
+        $time = time() - ($CFG->tempdatafoldercleanup * 3600);

        $dir = new \RecursiveDirectoryIterator($tmpdir);
        // Show all child nodes prior to their parent.