diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-10-16 01:34:05 -0700 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-10-16 01:34:05 -0700 |
| commit | ada94fb5581569b24ae4f2ffcf6fdf46d7b67f84 (patch) | |
| tree | 921eac17cf72c531ce5dd5fecff81ffa04825e1b /lib | |
| parent | 630be99ddf8508dd5d4b84bd5b9493bf84cc2e6a (diff) | |
| parent | e2cc7e7bf9a5c9ee44769429347833b7b748708a (diff) | |
| download | nextcloud-server-ada94fb5581569b24ae4f2ffcf6fdf46d7b67f84.tar.gz nextcloud-server-ada94fb5581569b24ae4f2ffcf6fdf46d7b67f84.zip | |
Merge pull request #5333 from owncloud/avater_with_encryption
avatars should also work with encryption after pr #5332 was merged
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/avatar.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/private/avatar.php b/lib/private/avatar.php index f20980c364b..720740569df 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -51,10 +51,6 @@ class OC_Avatar { * @return void */ public function set ($data) { - if (\OC_App::isEnabled('files_encryption')) { - $l = \OC_L10N::get('lib'); - throw new \Exception($l->t("Custom profile pictures don't work with encryption yet")); - } $img = new OC_Image($data); $type = substr($img->mimeType(), -3); |