sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix LocalStorage->unlink to work on folder as expected

remotes/origin/ldap_group_count
Robin Appelman 2014-05-06 15:54:48 +07:00
parent 8187164fe1
commit af35b6ad9d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/files/storage/local.php
Unescape Escape View File

@ -164,7 +164,14 @@ if (\OC_Util::runningOnWindows()) {
}
public function unlink($path) {
return unlink($this->datadir . $path);
if ($this->is_dir($path)) {
return $this->rmdir($path);
} else if ($this->is_file($path)) {
return unlink($this->datadir . $path);
} else {
return false;
}
}
public function rename($path1, $path2) {

2
lib/private/files/view.php
Unescape Escape View File

@ -432,7 +432,7 @@ class View {
if ($this->is_dir($path1)) {
$result = $this->copy($path1, $path2);
if ($result === true) {
$result = $storage1->unlink($internalPath1);
$result = $storage1->rmdir($internalPath1);
}
} else {
$source = $this->fopen($path1 . $postFix1, 'r');