Merge pull request #5333 from owncloud/avater_with_encryption
avatars should also work with encryption after pr #5332 was merged
This commit is contained in:
commit
ada94fb558
|
@ -51,10 +51,6 @@ class OC_Avatar {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function set ($data) {
|
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);
|
$img = new OC_Image($data);
|
||||||
$type = substr($img->mimeType(), -3);
|
$type = substr($img->mimeType(), -3);
|
||||||
|
|
|
@ -9,15 +9,14 @@
|
||||||
class Test_Avatar extends PHPUnit_Framework_TestCase {
|
class Test_Avatar extends PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
public function testAvatar() {
|
public function testAvatar() {
|
||||||
$this->markTestSkipped("Setting custom avatars with encryption doesn't work yet");
|
|
||||||
|
|
||||||
$avatar = new \OC_Avatar(\OC_User::getUser());
|
$avatar = new \OC_Avatar(\OC_User::getUser());
|
||||||
|
|
||||||
$this->assertEquals(false, $avatar->get());
|
$this->assertEquals(false, $avatar->get());
|
||||||
|
|
||||||
$expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
|
$expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
|
||||||
$avatar->set($expected->data());
|
|
||||||
$expected->resize(64);
|
$expected->resize(64);
|
||||||
|
$avatar->set($expected->data());
|
||||||
$this->assertEquals($expected->data(), $avatar->get()->data());
|
$this->assertEquals($expected->data(), $avatar->get()->data());
|
||||||
|
|
||||||
$avatar->remove();
|
$avatar->remove();
|
||||||
|
|
Loading…
Reference in New Issue