mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use right format for avatars 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-03-13 16:54:27 +01:00
parent e637113452
commit aa26a3ae74
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CardDAV/Converter.php
View File

@ -78,7 +78,7 @@ class Converter {
break;
case AccountManager::PROPERTY_AVATAR:
if ($image !== null) {
$vCard->add('PHOTO', 'data:'.$image->mimeType().';base64,' . base64_encode($image->data()));
$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
}
break;
case AccountManager::PROPERTY_EMAIL:

8
apps/dav/tests/unit/CardDAV/ConverterTest.php
View File

@ -146,7 +146,7 @@ class ConverterTest extends TestCase {
[
'cloud' => 'foo@cloud.net',
'email' => 'foo@bar.net',
'photo' => 'data:image/jpeg;base64,MTIzNDU2Nzg5',
'photo' => 'MTIzNDU2Nzg5',
],
null,
'foo@bar.net',
@ -157,7 +157,7 @@ class ConverterTest extends TestCase {
'cloud' => 'foo@cloud.net',
'email' => 'foo@bar.net',
'fn' => 'Dr. Foo Bar',
'photo' => 'data:image/jpeg;base64,MTIzNDU2Nzg5',
'photo' => 'MTIzNDU2Nzg5',
],
"Dr. Foo Bar",
"foo@bar.net",
@ -167,7 +167,7 @@ class ConverterTest extends TestCase {
[
'cloud' => 'foo@cloud.net',
'fn' => 'Dr. Foo Bar',
'photo' => 'data:image/jpeg;base64,MTIzNDU2Nzg5',
'photo' => 'MTIzNDU2Nzg5',
],
"Dr. Foo Bar",
null,
@ -177,7 +177,7 @@ class ConverterTest extends TestCase {
[
'cloud' => 'foo@cloud.net',
'fn' => 'Dr. Foo Bar',
'photo' => 'data:image/jpeg;base64,MTIzNDU2Nzg5',
'photo' => 'MTIzNDU2Nzg5',
],
'Dr. Foo Bar',
'',