diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2014-10-17 14:18:59 +0200 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2014-10-17 14:18:59 +0200 |
| commit | 2e875bc6b6a88903212f06fccc050edfc4d108a3 (patch) | |
| tree | 97fc869c01f7db94c42b01878f13bc4f5483f57c | |
| parent | 688a141586dad961b24b364e79cd11c1aa343730 (diff) | |
| parent | d37eee09a580cffdcc54b8f71b345622e221d528 (diff) | |
| download | nextcloud-server-2e875bc6b6a88903212f06fccc050edfc4d108a3.tar.gz nextcloud-server-2e875bc6b6a88903212f06fccc050edfc4d108a3.zip | |
Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index c4fc29db03a..59b191097af 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -24,6 +24,7 @@ */
namespace OCA\Encryption;
+use OCA\Encryption\Exceptions\EncryptionException;
/**
* Class for common cryptography functionality
@@ -289,9 +290,9 @@ class Crypt { $padded = self::addPadding($catfile);
return $padded;
- } catch (OCA\Encryption\Exceptions\EncryptionException $e) {
- $message = 'Could not encrypt file content (code: ' . $e->getCode . '): ';
- \OCP\Util::writeLog('files_encryption', $message . $e->getMessage, \OCP\Util::ERROR);
+ } catch (EncryptionException $e) {
+ $message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
+ \OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
return false;
}
|