mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-03-31 21:38:00 +02:00
commit e025f20995
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/task/file_temp_cleanup_task.php
View File

@ -88,8 +88,10 @@ class file_temp_cleanup_task extends scheduled_task {
}
}
} else {
// Return the time modified to the original date.
touch($node, $modifieddateobject[$node]);
// Return the time modified to the original date only for real files.
if ($iter->isDir() && !$iter->isDot()) {
touch($node, $modifieddateobject[$node]);
}
}
}
}

6
lib/tests/scheduled_task_test.php
View File

@ -395,8 +395,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
$iter = new \RecursiveIteratorIterator($dir, \RecursiveIteratorIterator::CHILD_FIRST);
for ($iter->rewind(); $iter->valid(); $iter->next()) {
$node = $iter->getRealPath();
touch($node, time() - (8 * 24 * 3600));
if ($iter->isDir() && !$iter->isDot()) {
$node = $iter->getRealPath();
touch($node, time() - (8 * 24 * 3600));
}
}
// Run the scheduled task again to remove all of the files and directories.