[Pkg-owncloud-commits] [owncloud] 343/457: add hint to exception

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit d743d6d35642ec18de996d07ba04b198ae50bcfe
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Jun 8 14:43:45 2015 +0200

    add hint to exception
---
 apps/encryption/lib/crypto/encryption.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 9094a84..fe1d955 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 = '';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git