This commit is contained in:
Sjors van der Pluijm 2014-04-28 10:20:24 +02:00
parent 727e3e2359
commit d8be9d96ed
1 changed files with 4 additions and 1 deletions

View File

@ -44,17 +44,20 @@ if (\OC_Util::runningOnWindows()) {
new \RecursiveDirectoryIterator($this->datadir . $path),
\RecursiveIteratorIterator::CHILD_FIRST
);
foreach ($it as $file) {
while ($it->valid()) {
/**
* @var \SplFileInfo $file
*/
$file = $it->current();
if (in_array($file->getBasename(), array('.', '..'))) {
$it->next();
continue;
} elseif ($file->isDir()) {
rmdir($file->getPathname());
} elseif ($file->isFile() || $file->isLink()) {
unlink($file->getPathname());
}
$it->next();
}
return rmdir($this->datadir . $path);
} catch (\UnexpectedValueException $e) {