Merge pull request #2985 from tristanlins/hotfix/filesystem-remove-directory

Graceful fallback in Filesystem::removeDirectory() to php
main
Jordi Boggiano 10 years ago
commit 43a72d1132

@ -85,10 +85,14 @@ class Filesystem
$result = $this->getProcess()->execute($cmd, $output) === 0;
// clear stat cache because external processes aren't tracked by the php stat cache
clearstatcache();
if ($result) {
// clear stat cache because external processes aren't tracked by the php stat cache
clearstatcache();
return !is_dir($directory);
}
return $result && !is_dir($directory);
return $this->removeDirectoryPhp($directory);
}
/**

Loading…
Cancel
Save