diff options
author | Vincent Petry <pvince81@owncloud.com> | 2015-06-03 14:31:58 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2015-06-03 14:31:58 +0200 |
commit | 263bb46ff892c0a7de7852ce0ab9b9c1d2381054 (patch) | |
tree | 2295a60dbb0cc0dadc081dc3beec4d61e08bf01c /apps/files/ajax/delete.php | |
parent | 500748725c46803ff2a0ec291db37a831322012c (diff) | |
download | nextcloud-server-263bb46ff892c0a7de7852ce0ab9b9c1d2381054.tar.gz nextcloud-server-263bb46ff892c0a7de7852ce0ab9b9c1d2381054.zip |
Catch exceptions in files ajax calls
Diffstat (limited to 'apps/files/ajax/delete.php')
-rw-r--r-- | apps/files/ajax/delete.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 9d4f0b0fcf5..dcd05d8da9e 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -54,10 +54,15 @@ $success = true; //Now delete foreach ($files as $file) { - if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) && - !(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) && - \OC\Files\Filesystem::unlink($dir . '/' . $file)) - ) { + try { + if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) && + !(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) && + \OC\Files\Filesystem::unlink($dir . '/' . $file)) + ) { + $filesWithError .= $file . "\n"; + $success = false; + } + } catch (\Exception $e) { $filesWithError .= $file . "\n"; $success = false; } |