diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2025-08-04 13:39:16 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2025-08-04 13:39:16 +0100 |
| commit | c16c601f1582dcc51b0cf8d7047b821a544bee20 (patch) | |
| tree | 76126d6d2190c5998295d7f3fb0c142a837826ee | |
| parent | 4ffe416609510d0e883d217bdcada4fd0f4336ff (diff) | |
| download | webtrees-c16c601f1582dcc51b0cf8d7047b821a544bee20.tar.gz webtrees-c16c601f1582dcc51b0cf8d7047b821a544bee20.tar.bz2 webtrees-c16c601f1582dcc51b0cf8d7047b821a544bee20.zip | |
Revert "Fix: #5075 - trailing space after empty NOTE tag"
This reverts commit a04b2cdfbde7eea55378f6ff8ff445d42dc06687.
| -rw-r--r-- | app/Services/GedcomImportService.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Services/GedcomImportService.php b/app/Services/GedcomImportService.php index dbf7a48851..1deec1508c 100644 --- a/app/Services/GedcomImportService.php +++ b/app/Services/GedcomImportService.php @@ -188,13 +188,13 @@ class GedcomImportService while (str_contains($data, ' ')) { $data = strtr($data, [' ' => ' ']); } - $newrec .= ($newrec !== '' ? "\n" : '') . $level . ' ' . ($level === '0' && $xref !== '' ? $xref . ' ' : '') . $tag . ($data === '' ? '' : ' ' . $data); + $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level === '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag !== 'NOTE' ? '' : ' ' . $data); break; case 'NOTE': case 'TEXT': case 'DATA': case 'CONT': - $newrec .= ($newrec !== '' ? "\n" : '') . $level . ' ' . ($level === '0' && $xref !== '' ? $xref . ' ' : '') . $tag . ($data === '' ? '' : ' ' . $data); + $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level === '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag !== 'NOTE' ? '' : ' ' . $data); break; case 'FILE': // Strip off the user-defined path prefix @@ -205,7 +205,7 @@ class GedcomImportService // convert backslashes in filenames to forward slashes $data = preg_replace("/\\\\/", '/', $data); - $newrec .= ($newrec !== '' ? "\n" : '') . $level . ' ' . ($level === '0' && $xref !== '' ? $xref . ' ' : '') . $tag . ($data === '' ? '' : ' ' . $data); + $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level === '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag !== 'NOTE' ? '' : ' ' . $data); break; case 'CONC': // Merge CONC lines, to simplify access later on. |