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 aed53d5db5a33de4f8a7cb48cb2a0b15e1ff5a53..538bdf99cc664ec212d946fb62615c062d6d6d27 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;
        }