diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-10-22 08:28:02 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-10-22 08:28:02 +0100 |
| commit | 678794ef22aaf3507000e2a096fb3cc47b65310b (patch) | |
| tree | cfeeb19a9e02c2c9051ada40d1c487caa77db683 /app/Http/RequestHandlers/GedcomLoad.php | |
| parent | 3cf189cfdbe7ed691af5f1e1ecd2f8d98be40a5e (diff) | |
| download | webtrees-678794ef22aaf3507000e2a096fb3cc47b65310b.tar.gz webtrees-678794ef22aaf3507000e2a096fb3cc47b65310b.tar.bz2 webtrees-678794ef22aaf3507000e2a096fb3cc47b65310b.zip | |
Fix: importing GEDCOM files with macintosh line endings
Diffstat (limited to 'app/Http/RequestHandlers/GedcomLoad.php')
| -rw-r--r-- | app/Http/RequestHandlers/GedcomLoad.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index c8a07a51d3..d61f7effc1 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -139,7 +139,7 @@ class GedcomLoad implements RequestHandlerInterface } // What character set is this? Need to convert it to UTF8 - if (preg_match('/[\r\n][ \t]*1 CHAR(?:ACTER)? (.+)/', $data->chunk_data, $match)) { + if (preg_match('/[\r\n][ \t]*1 CHAR(?:ACTER)? ([^\r\n]+)/', $data->chunk_data, $match)) { $charset = strtoupper(trim($match[1])); } else { $charset = 'ASCII'; |