diff options
| author | Christian Schneider | 2015-08-12 15:27:39 +0200 |
|---|---|---|
| committer | Christian Schneider | 2015-08-12 15:27:39 +0200 |
| commit | 1c0a580ec4de036530b08a83d5ddc2d915bdfd0b (patch) | |
| tree | da17deffd92927957246b5f3cb13393c853f0446 /it_pipe.class | |
| parent | 0bb7f6148acb2a4a4d2caaa83c9ffa5b27aa8e1c (diff) | |
| parent | 79d5a50477ed74940484a5ca046dfa04adce1550 (diff) | |
| download | itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.tar.gz itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.tar.bz2 itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.zip | |
Merge branch 'master' into cs/php7
Diffstat (limited to 'it_pipe.class')
| -rw-r--r-- | it_pipe.class | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/it_pipe.class b/it_pipe.class index 737908a..6b43466 100644 --- a/it_pipe.class +++ b/it_pipe.class @@ -168,7 +168,8 @@ function csv($forceschema = null) foreach (preg_grep('/^$/', $cols) as $idx => $dummy) $cols[$idx] = "field$idx"; # replace empty column names - $oldlocale = setlocale(LC_CTYPE, 'de_CH.iso-8859-1'); # this works for utf-8 as well + $oldlocale = setlocale(LC_CTYPE, "0"); + setlocale(LC_CTYPE, 'de_CH.iso-8859-1'); # this works for utf-8 as well foreach ($this->lines as $line) $records[] = (object)array_combine($cols, str_getcsv($line, $splitchar, '"')); # could do a function_exists('str_getcsv') here... |