mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-25 12:21:26 +02:00
do NOT search for empty UUID
This commit is contained in:
parent
372047388f
commit
ca8abb4a9c
@ -325,7 +325,7 @@ class Import
|
|||||||
$hide_binary = ['jpegphoto' => $contact['jpegphoto'] ? bytes($contact['jpegphoto']).' bytes binary data' : null];
|
$hide_binary = ['jpegphoto' => $contact['jpegphoto'] ? bytes($contact['jpegphoto']).' bytes binary data' : null];
|
||||||
$this->logger(++$num.'. User: '.json_encode($hide_binary + $contact + $account, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE), 'debug');
|
$this->logger(++$num.'. User: '.json_encode($hide_binary + $contact + $account, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE), 'debug');
|
||||||
// check if account exists in sql
|
// check if account exists in sql
|
||||||
if (!($account_id = $this->accounts_sql->name2id($account['account_uuid'], 'account_uuid')) &&
|
if (!($account_id = !empty($account['account_uuid']) ? $this->accounts_sql->name2id($account['account_uuid'], 'account_uuid') : false) &&
|
||||||
!($account_id = $this->accounts_sql->name2id($account['account_lid'])))
|
!($account_id = $this->accounts_sql->name2id($account['account_lid'])))
|
||||||
{
|
{
|
||||||
$sql_account = $account;
|
$sql_account = $account;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user