diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-11-20 16:34:33 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-10 08:24:27 +0100 |
| commit | a05fc9dc73723b66968dfafd9834a2290d6a7960 (patch) | |
| tree | ceda850698c6f9afc81ce2380f57a83b35eee410 /apps | |
| parent | cf0a12f999f6b6316946b8ebfd7ee8f0030f7084 (diff) | |
| download | nextcloud-server-a05fc9dc73723b66968dfafd9834a2290d6a7960.tar.gz nextcloud-server-a05fc9dc73723b66968dfafd9834a2290d6a7960.zip | |
Check if files are deletable before trying to delete them
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/delete.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index aed53d5db5a..538bdf99cc6 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -27,7 +27,9 @@ $success = true; //Now delete foreach ($files as $file) { if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) && - !\OC\Files\Filesystem::unlink($dir . '/' . $file)) { + !(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) && + \OC\Files\Filesystem::unlink($dir . '/' . $file)) + ) { $filesWithError .= $file . "\n"; $success = false; } |