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

MDL-38570 admin: fix cron_delete_from_temp on windows

Browse Source
This commit is contained in:
Tim Gus
2013-09-12 11:33:32 +08:00
committed by Dan Poltawski
parent ef9ca10699
commit c4012e7e82
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cronlib.php
+1 -1
View File
@@ -790,7 +790,7 @@ function cron_delete_from_temp() {
$iter = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
for ($iter->rewind(); $iter->valid(); $iter->next()) {
$node = $iter->getPathname();
$node = $iter->getRealPath();
if (!is_readable($node)) {
continue;
}
lib/tests/cronlib_test.php
+11 -9
View File
@@ -37,6 +37,8 @@ class cronlib_testcase extends basic_testcase {
*/
public function cron_delete_from_temp_provider() {
global $CFG;
$tmpdir = realpath($CFG->tempdir);
$time = time();
$weekstime = $time - strtotime('1 week');
@@ -97,14 +99,14 @@ class cronlib_testcase extends basic_testcase {
array(
array($node1, $node2, $node3, $node4, $node5, $node6, $node7, $node8, $node9, $node10),
array(
"$CFG->tempdir/dir1",
"$CFG->tempdir/dir1/dir1_1",
"$CFG->tempdir/dir1/dir1_1/dir1_2",
"$CFG->tempdir/dir1/dir1_1/dir1_2/file2",
"$CFG->tempdir/dir1/dir1_4",
"$CFG->tempdir/dir1/dir1_4/file2",
"$CFG->tempdir/dir2",
"$CFG->tempdir/file1",
$tmpdir.DIRECTORY_SEPARATOR.'dir1',
$tmpdir.DIRECTORY_SEPARATOR.'dir1'.DIRECTORY_SEPARATOR.'dir1_1',
$tmpdir.DIRECTORY_SEPARATOR.'dir1'.DIRECTORY_SEPARATOR.'dir1_1'.DIRECTORY_SEPARATOR.'dir1_2',
$tmpdir.DIRECTORY_SEPARATOR.'dir1'.DIRECTORY_SEPARATOR.'dir1_1'.DIRECTORY_SEPARATOR.'dir1_2'.DIRECTORY_SEPARATOR.'file2',
$tmpdir.DIRECTORY_SEPARATOR.'dir1'.DIRECTORY_SEPARATOR.'dir1_4',
$tmpdir.DIRECTORY_SEPARATOR.'dir1'.DIRECTORY_SEPARATOR.'dir1_4'.DIRECTORY_SEPARATOR.'file2',
$tmpdir.DIRECTORY_SEPARATOR.'dir2',
$tmpdir.DIRECTORY_SEPARATOR.'file1',
)
),
array(
@@ -143,7 +145,7 @@ class cronlib_testcase extends basic_testcase {
$actual = array();
for ($iter->rewind(); $iter->valid(); $iter->next()) {
if (!$iter->isDot()) {
$actual[] = $iter->getPathname();
$actual[] = $iter->getRealPath();
}
}