mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-22 21:30:54 +01:00
No need to merge into signature if there is no signature
This commit is contained in:
parent
693cf1f116
commit
8f51b00da3
@ -1266,9 +1266,9 @@ 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'))
|
elseif(class_exists($this->app . '_merge') && $config['signature'])
|
||||||
{
|
{
|
||||||
$merge_class = $this->app.'_merge';
|
$merge_class = $this->app . '_merge';
|
||||||
$merge = new $merge_class();
|
$merge = new $merge_class();
|
||||||
$error = null;
|
$error = null;
|
||||||
$sig = $merge->merge_string($config['signature']??null, array($data[$this->id_field]), $error, 'text/html');
|
$sig = $merge->merge_string($config['signature']??null, array($data[$this->id_field]), $error, 'text/html');
|
||||||
|
Loading…
Reference in New Issue
Block a user