diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-12-13 22:26:27 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-12-13 22:26:27 +0000 |
| commit | 91bfe40cbc9e3000d65a1b6baea3ca3b154c784d (patch) | |
| tree | 9063d95fef855fc911704603de8306f297f64f25 /import.php | |
| parent | 67c2d836736a2e91f74139d002ff418b8a3b1878 (diff) | |
| download | webtrees-91bfe40cbc9e3000d65a1b6baea3ca3b154c784d.tar.gz webtrees-91bfe40cbc9e3000d65a1b6baea3ca3b154c784d.tar.bz2 webtrees-91bfe40cbc9e3000d65a1b6baea3ca3b154c784d.zip | |
Fix: Imported does not recognise encoding of files with indented headers.
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import.php b/import.php index c3b9bc9405..18556c9c39 100644 --- a/import.php +++ b/import.php @@ -123,7 +123,7 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { exit; } // What character set is this? Need to convert it to UTF8 - if (preg_match('/\n1 CHAR(?:ACTER)? (.+)/', $data->chunk_data, $match)) { + if (preg_match('/\n[ \t]*1 CHAR(?:ACTER)? (.+)/', $data->chunk_data, $match)) { $charset=strtoupper($match[1]); } else { $charset='ASCII'; |