summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-06-08 22:28:26 +0200
committerBjörn Schießle <bjoern@schiessle.org>2015-06-08 22:28:26 +0200
commit2ae2da576f863c999eece414de3b18ba222e81cb (patch)
tree4fba5a60d6167eeb7982ce9dbafdff105a7522d8
parent64c9c27f7e19745e7b7d6b51120262485e4712c6 (diff)
parentd743d6d35642ec18de996d07ba04b198ae50bcfe (diff)
downloadnextcloud-server-2ae2da576f863c999eece414de3b18ba222e81cb.tar.gz
nextcloud-server-2ae2da576f863c999eece414de3b18ba222e81cb.zip
Merge pull request #16798 from owncloud/enc_add_hint_to_exception
add hint to exception
-rw-r--r--apps/encryption/lib/crypto/encryption.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 9094a84d4c8..fe1d955524a 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -279,12 +279,11 @@ class Encryption implements IEncryptionModule {
*/
public function decrypt($data) {
if (empty($this->fileKey)) {
- $msg = $this->l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
- $this->logger->error('Can not decrypt this file,
- probably this is a shared file.
- Please ask the file owner to reshare the file with you.');
+ $msg = 'Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.';
+ $hint = $this->l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+ $this->logger->error($msg);
- throw new DecryptionFailedException($msg);
+ throw new DecryptionFailedException($msg, $hint);
}
$result = '';