From 3380bd650f1c716fe25c750a5a1eadb2055c612a Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Mon, 14 Oct 2013 17:30:24 +0200 Subject: avatars should also work with encryption after pr #5332 was merged --- lib/private/avatar.php | 4 ---- 1 file changed, 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); -- cgit v1.2.3 From 0b8273c76834783461bc186cca69e1a73f2570de Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 15 Oct 2013 11:53:32 +0200 Subject: test should work now --- tests/lib/avatar.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 1c5195f8eb1..b458e40bc11 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -9,7 +9,6 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { public function testAvatar() { - $this->markTestSkipped("Setting custom avatars with encryption doesn't work yet"); $avatar = new \OC_Avatar(\OC_User::getUser()); -- cgit v1.2.3 From e2cc7e7bf9a5c9ee44769429347833b7b748708a Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 15 Oct 2013 17:23:47 +0200 Subject: Fix avatar unittest --- tests/lib/avatar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index b458e40bc11..6e6faed2d2c 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -15,8 +15,8 @@ class Test_Avatar extends PHPUnit_Framework_TestCase { $this->assertEquals(false, $avatar->get()); $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png'); - $avatar->set($expected->data()); $expected->resize(64); + $avatar->set($expected->data()); $this->assertEquals($expected->data(), $avatar->get()->data()); $avatar->remove(); -- cgit v1.2.3