summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-13 15:56:29 +0200
committerGitHub <noreply@github.com>2016-06-13 15:56:29 +0200
commitf882f6b551533752b20ecd8a394cbcecaad5710b (patch)
tree4c262707b6ba0f6b8d206d524b6e4c9ae76a5c11
parent12098383cce8f6b541e2536fe8e1b446b50fde4c (diff)
parent8e640faf3a28f1d03e332bbdeac875c281b7300d (diff)
downloadnextcloud-server-f882f6b551533752b20ecd8a394cbcecaad5710b.tar.gz
nextcloud-server-f882f6b551533752b20ecd8a394cbcecaad5710b.zip
Merge pull request #25037 from owncloud/handle_delete_with_unavailable_storage
Handle "storage not available" to show an error message
-rw-r--r--apps/files/ajax/delete.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 2d02869df14..07bd01cd250 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -72,6 +72,9 @@ try {
} catch(\OCP\Files\NotFoundException $e) {
OCP\JSON::error(['data' => ['message' => 'File not found']]);
return;
+} catch(\OCP\Files\StorageNotAvailableException $e) {
+ OCP\JSON::error(['data' => ['message' => 'Storage not available']]);
+ return;
}
if ($success) {