Check if files are deletable before trying to delete them

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 323b70706ce1dda148944c3504a2c020bbad0159..4d4232e872e4de0ae5a51552cd7c9084f9da88fe 100644 (file)
--- 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;
        }