mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-26 11:48:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dont concat if one of the strings is empty during part merge

Browse source
This commit is contained in:
Jan Böhmer 2023-11-24 23:16:26 +01:00
parent 36879dd7da
commit b9956e38b8
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Services/EntityMergers/Mergers/EntityMergerHelperTrait.php
View file

@ -319,6 +319,14 @@ trait EntityMergerHelperTrait
return $t;
}
//Skip empty strings
if (trim($t) === '') {
return trim($o);
}
if (trim($o) === '') {
return trim($t);
}
return trim($t) . $separator . trim($o);
},
$target,
@ -344,6 +352,14 @@ trait EntityMergerHelperTrait
return $t;
}
//Skip empty strings
if (trim($t) === '') {
return trim($o);
}
if (trim($o) === '') {
return trim($t);
}
return sprintf("%s\n\n<b>%s:</b>\n%s",
trim($t),
$other->getName(),