aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-12-22 14:27:28 +0100
committerGitHub <noreply@github.com>2019-12-22 14:27:28 +0100
commit04031f606a5ac673cdb1cdb7d76fde99fd748e81 (patch)
tree38668780726fdebba83282cad648a1de751dfd01 /apps
parent3af63f1593b94c811fbefea6ccfba379c71ef957 (diff)
parent0ddb9c01362a74662a4f062683c82c1594c7da01 (diff)
downloadnextcloud-server-04031f606a5ac673cdb1cdb7d76fde99fd748e81.tar.gz
nextcloud-server-04031f606a5ac673cdb1cdb7d76fde99fd748e81.zip
Merge pull request #18478 from nextcloud/fix/direct-editing-invalid-editor-id
Do not generate tokens for editor IDs that do not exist
Diffstat (limited to 'apps')
-rw-r--r--apps/files/lib/Controller/DirectEditingController.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/lib/Controller/DirectEditingController.php b/apps/files/lib/Controller/DirectEditingController.php
index b19d0f3ea1d..099c65f73e6 100644
--- a/apps/files/lib/Controller/DirectEditingController.php
+++ b/apps/files/lib/Controller/DirectEditingController.php
@@ -89,7 +89,7 @@ class DirectEditingController extends OCSController {
]);
} catch (Exception $e) {
$this->logger->logException($e, ['message' => 'Exception when creating a new file through direct editing']);
- return new DataResponse('Failed to create file', Http::STATUS_FORBIDDEN);
+ return new DataResponse('Failed to create file: ' . $e->getMessage(), Http::STATUS_FORBIDDEN);
}
}
@@ -106,7 +106,7 @@ class DirectEditingController extends OCSController {
]);
} catch (Exception $e) {
$this->logger->logException($e, ['message' => 'Exception when opening a file through direct editing']);
- return new DataResponse('Failed to open file', Http::STATUS_FORBIDDEN);
+ return new DataResponse('Failed to open file: ' . $e->getMessage(), Http::STATUS_FORBIDDEN);
}
}
@@ -122,7 +122,7 @@ class DirectEditingController extends OCSController {
return new DataResponse($this->directEditingManager->getTemplates($editorId, $creatorId));
} catch (Exception $e) {
$this->logger->logException($e);
- return new DataResponse('Failed to open file', Http::STATUS_INTERNAL_SERVER_ERROR);
+ return new DataResponse('Failed to obtain template list: ' . $e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR);
}
}
}