Merge pull request #5333 from owncloud/avater_with_encryption

avatars should also work with encryption after pr #5332 was merged

2 files changed, 1 insertions, 6 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);
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
index 1c5195f8eb1..6e6faed2d2c 100644
--- a/tests/lib/avatar.php
+++ b/tests/lib/avatar.php
@@ -9,15 +9,14 @@
 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());
 
 		$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();