diff --git a/tine20/Tinebase/User.php b/tine20/Tinebase/User.php index 959ad2c0d0..16673d3524 100644 --- a/tine20/Tinebase/User.php +++ b/tine20/Tinebase/User.php @@ -802,7 +802,20 @@ protected static function getPrimaryGroupForUser(Tinebase_Model_FullUser $user): try { $group = Tinebase_Group::getInstance()->getGroupById($user->accountPrimaryGroup); } catch (Tinebase_Exception_Record_NotDefined $tern) { - $group = self::_getPrimaryGroupFromSyncBackend($user); + try { + $group = self::_getPrimaryGroupFromSyncBackend($user); + } catch (Tinebase_Exception $te) { + if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) { + Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ + . ' ' . $te->getMessage()); + } + $group = Tinebase_Group::getInstance()->getDefaultGroup(); + if (Tinebase_Core::isLogLevel(Zend_Log::INFO)) { + Tinebase_Core::getLogger()->info(__METHOD__ . '::' . __LINE__ + . ' Assign default user group: ' . $group->name); + } + $user->accountPrimaryGroup = $group; + } } return $group; @@ -833,8 +846,10 @@ protected static function _getPrimaryGroupFromSyncBackend(Tinebase_Model_FullUse throw new Tinebase_Exception('Group already exists but it has a different ID: ' . $group->name); } catch (Tinebase_Exception_Record_NotDefined $tern) { - if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ - . " Adding group " . $group->name); + if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) { + Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ + . " Adding group " . $group->name); + } $transactionId = Tinebase_TransactionManager::getInstance() ->startTransaction(Tinebase_Core::getDb());