diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-02-15 09:59:01 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-02-18 08:43:18 +0000 |
| commit | 1c6adce825f16611bd8b75a22114302de4b41cfe (patch) | |
| tree | 637405c351f9c4f686d5b88bc3c9b3b3092d0be1 /app/Http/RequestHandlers/ImportGedcomAction.php | |
| parent | 6f6acc7a1debce8fb3392dc3c800623417f681b4 (diff) | |
| download | webtrees-1c6adce825f16611bd8b75a22114302de4b41cfe.tar.gz webtrees-1c6adce825f16611bd8b75a22114302de4b41cfe.tar.bz2 webtrees-1c6adce825f16611bd8b75a22114302de4b41cfe.zip | |
Fix: #1663 - add support for ANSEL encoding
Diffstat (limited to 'app/Http/RequestHandlers/ImportGedcomAction.php')
| -rw-r--r-- | app/Http/RequestHandlers/ImportGedcomAction.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/Http/RequestHandlers/ImportGedcomAction.php b/app/Http/RequestHandlers/ImportGedcomAction.php index fa90f738e1..343888d290 100644 --- a/app/Http/RequestHandlers/ImportGedcomAction.php +++ b/app/Http/RequestHandlers/ImportGedcomAction.php @@ -73,6 +73,7 @@ class ImportGedcomAction implements RequestHandlerInterface $keep_media = (bool) ($params['keep_media'] ?? false); $WORD_WRAPPED_NOTES = (bool) ($params['WORD_WRAPPED_NOTES'] ?? false); $GEDCOM_MEDIA_PATH = $params['GEDCOM_MEDIA_PATH']; + $encoding = $params['encoding'] ?? ''; // Save these choices as defaults $tree->setPreference('keep_media', $keep_media ? '1' : '0'); @@ -86,7 +87,7 @@ class ImportGedcomAction implements RequestHandlerInterface throw new FileUploadException($upload); } - $this->tree_service->importGedcomFile($tree, $upload->getStream(), basename($upload->getClientFilename())); + $this->tree_service->importGedcomFile($tree, $upload->getStream(), basename($upload->getClientFilename()), $encoding); } if ($source === 'server') { @@ -95,7 +96,7 @@ class ImportGedcomAction implements RequestHandlerInterface if ($basename) { $resource = $data_filesystem->readStream($basename); $stream = $this->stream_factory->createStreamFromResource($resource); - $this->tree_service->importGedcomFile($tree, $stream, $basename); + $this->tree_service->importGedcomFile($tree, $stream, $basename, $encoding); } else { FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger'); } |