File iRony-0.2.3-2335.patch of Package iRony

File iRony-0.2.3-2335.patch of Package iRony (Revision 25)

Currently displaying revision 25 , Show latest

commit 5dfcf76244890a30c17db0a7b9e52cc83abc2751
Author: Thomas <tb@woodcrest.local>
Date:   Thu Oct 10 18:23:38 2013 +0200

Don't rely on position for photo encoding parameter (#2335)

diff --git a/lib/Kolab/CardDAV/ContactsBackend.php b/lib/Kolab/CardDAV/ContactsBackend.php
index 414805a..eec0bf3 100644
--- a/lib/Kolab/CardDAV/ContactsBackend.php
+++ b/lib/Kolab/CardDAV/ContactsBackend.php
@@ -885,8 +885,8 @@ class ContactsBackend extends CardDAV\Backend\AbstractBackend
                     break;
 
                 case 'PHOTO':
-                    $param = $prop->parameters[0];
-                    if ($param->value && strtolower($param->value) == 'b' || strtolower($param->name) == 'base64') {
+                    $param = $prop->offsetGet('encoding') ?: $prop->parameters[0];
+                    if ($param->value && (strtolower($param->value) == 'b' || strtolower($param->value) == 'base64') || strtolower($param->name) == 'base64') {
                         $contact['photo'] = base64_decode($prop->value);
                     }
                     break;