diff options
author | Björn Schießle <schiessle@owncloud.com> | 2014-08-14 11:44:50 +0200 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2014-08-14 11:44:50 +0200 |
commit | 27d94e92736e40044d8543d33813fe548af45335 (patch) | |
tree | 6d5f5ba55f05538d7a9d31ad61f6d1604ca42227 /apps/files/ajax | |
parent | 987a0565fb04c273ce05bdde77d2084ceffa230e (diff) | |
parent | bc8e1ebf75b641f4be1d404cbcdbf5f77bbff5dc (diff) | |
download | nextcloud-server-27d94e92736e40044d8543d33813fe548af45335.tar.gz nextcloud-server-27d94e92736e40044d8543d33813fe548af45335.zip |
Merge pull request #10295 from owncloud/file_actions_error_handling
file actions improved error handling
Diffstat (limited to 'apps/files/ajax')
-rw-r--r-- | apps/files/ajax/delete.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index a28b7b76c95..aed53d5db5a 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -26,7 +26,8 @@ $success = true; //Now delete foreach ($files as $file) { - if (($dir === '' && $file === 'Shared') || !\OC\Files\Filesystem::unlink($dir . '/' . $file)) { + if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) && + !\OC\Files\Filesystem::unlink($dir . '/' . $file)) { $filesWithError .= $file . "\n"; $success = false; } |