mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
fix some PHP Warnings
This commit is contained in:
parent
0287ce0e0d
commit
46a5581d2b
@ -1266,7 +1266,7 @@ abstract class Tracking
|
|||||||
{
|
{
|
||||||
error_log($this->app . ' did not properly implement bo_tracking->id_field. Merge skipped.');
|
error_log($this->app . ' did not properly implement bo_tracking->id_field. Merge skipped.');
|
||||||
}
|
}
|
||||||
elseif(class_exists($this->app . '_merge') && $config['signature'])
|
elseif(class_exists($this->app . '_merge') && !empty($config['signature']))
|
||||||
{
|
{
|
||||||
$merge_class = $this->app . '_merge';
|
$merge_class = $this->app . '_merge';
|
||||||
$merge = new $merge_class();
|
$merge = new $merge_class();
|
||||||
@ -1279,7 +1279,7 @@ abstract class Tracking
|
|||||||
}
|
}
|
||||||
return $sig;
|
return $sig;
|
||||||
}
|
}
|
||||||
return $config['signature'];
|
return $config['signature'] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -79,7 +79,7 @@ class notifications_email implements notifications_iface {
|
|||||||
|
|
||||||
// Use configured mail account
|
// Use configured mail account
|
||||||
$ident = null;
|
$ident = null;
|
||||||
if($this->config->async_identity)
|
if(!empty($this->config->async_identity))
|
||||||
{
|
{
|
||||||
$ident = Api\Mail\Account::read($this->config->async_identity, $_sender->account_id ?? null);
|
$ident = Api\Mail\Account::read($this->config->async_identity, $_sender->account_id ?? null);
|
||||||
}
|
}
|
||||||
|
@ -243,7 +243,7 @@ class notifications_popup implements notifications_iface
|
|||||||
} else {
|
} else {
|
||||||
$image = '';
|
$image = '';
|
||||||
}
|
}
|
||||||
if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
|
if($link->popup && empty($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient']))
|
||||||
{
|
{
|
||||||
$data = array(
|
$data = array(
|
||||||
"data-app = '{$link->app}'",
|
"data-app = '{$link->app}'",
|
||||||
|
Loading…
Reference in New Issue
Block a user