L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-04-01 01:13:20 +02:00
parent 811b80a4c5 c01741c8cc
commit 16008dfd92
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/task/file_temp_cleanup_task.php
+4 -2
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]);
}
}
}
}
lib/tests/scheduled_task_test.php
+4 -2
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.