mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6158 from owncloud/rmdir-check 

check if a directory exists before we try to remove it
This commit is contained in:
Thomas Müller 2013-12-02 15:14:41 -08:00
parent 83ec234f53 64bfcbee0a
commit a999350f69
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/files/view.php
View File

@ -159,7 +159,11 @@ class View {
}
public function rmdir($path) {
return $this->basicOperation('rmdir', $path, array('delete'));
if ($this->is_dir($path)) {
return $this->basicOperation('rmdir', $path, array('delete'));
} else {
return false;
}
}
public function opendir($path) {
@ -712,7 +716,7 @@ class View {
return false;
}
$defaultRoot = Filesystem::getRoot();
if($this->fakeRoot === $defaultRoot){
if ($this->fakeRoot === $defaultRoot) {
return true;
}
return (strlen($this->fakeRoot) > strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');