Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:13:16 +0000 (13:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:13:16 +0000 (13:13 +0100)
Change-Id: I541083051a04dd7293c1053fe5a023e5c72675d7

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Tinebase/Controller.php

@@@ -133,12 -133,7 +133,18 @@@ class Tinebase_Controller extends Tineb
                   * we can work with the data synced during previous login
                   */
                  try {
-                     // only syncContactData if webclient!
-                     $syncOptions = in_array($_accessLog->clienttype, array(Tinebase_Server_WebDAV::REQUEST_TYPE, ActiveSync_Server_Http::REQUEST_TYPE)
 -                    Tinebase_User::syncUser($_username, array('syncContactData' => true, 'syncContactPhoto' => true));
++                    // only syncContactData if non-sync client!
++                    $syncOptions = in_array($_accessLog->clienttype, array(
++                        Tinebase_Server_WebDAV::REQUEST_TYPE,
++                        ActiveSync_Server_Http::REQUEST_TYPE
++                    ))
 +                        ? array()
-                         : array('syncContactData' => TRUE));
++                        : array(
++                            'syncContactData' => true,
++                            'syncContactPhoto' => true
++                        );
 +
 +                    Tinebase_User::syncUser($_username, $syncOptions);
                  } catch (Exception $e) {
                      Tinebase_Core::getLogger()->crit(__METHOD__ . '::' . __LINE__ . ' Failed to sync user data for: ' . $_username . ' reason: ' . $e->getMessage());
                      Tinebase_Exception::log($e);