diff options
| author | Urban Müller | 2020-12-15 18:39:05 +0100 |
|---|---|---|
| committer | Urban Müller | 2020-12-15 18:39:05 +0100 |
| commit | 6ca1388575897cd66fb896e0aee3bf63b0d0e934 (patch) | |
| tree | 72097e4237c8b504cca9d26384faab6904ab2c5b /it.class | |
| parent | 4234f32f38bb1d8224a98bd292cbcd29dbca93f7 (diff) | |
| download | itools-6ca1388575897cd66fb896e0aee3bf63b0d0e934.tar.gz itools-6ca1388575897cd66fb896e0aee3bf63b0d0e934.tar.bz2 itools-6ca1388575897cd66fb896e0aee3bf63b0d0e934.zip | |
do not prepend $errprefix twice
Diffstat (limited to 'it.class')
| -rw-r--r-- | it.class | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -553,7 +553,7 @@ static function any2utf8($value, $errprefix = "") if (grapheme_strlen($value) === null) list($value, $error) = array(utf8_encode($value), utf8_encode("incorrect utf8-encoding. input=$value")); if (preg_match('/\xc3[\x82\x83]\xc2[\x82\x83\xbc\xa9\xa4\xb6\xa8\xa2\xa0\xb4\xaa\xa7\x84\xab\xae\x9c\xaf\x96\xb2\xbb\xb9\x9f]/', $value)) - list($value, $error) = array(it::any2utf8(preg_replace_callback('/\xc3[\x82\x83]\xc2[\x82\x83\xbc\xa9\xa4\xb6\xa8\xa2\xa0\xb4\xaa\xa7\x84\xab\xae\x9c\xaf\x96\xb2\xbb\xb9\x9f]/', function($m) {return utf8_decode($m[0]);}, $value)), $errprefix ? "$errprefix: double utf8-encoding. input=$value" : ""); + list($value, $error) = array(it::any2utf8(preg_replace_callback('/\xc3[\x82\x83]\xc2[\x82\x83\xbc\xa9\xa4\xb6\xa8\xa2\xa0\xb4\xaa\xa7\x84\xab\xae\x9c\xaf\x96\xb2\xbb\xb9\x9f]/', function($m) {return utf8_decode($m[0]);}, $value)), $errprefix ? "double utf8-encoding. input=$value" : ""); if (preg_match('/\xef\xb7[\x90-\xaf]|\xef\xbf[\xbe\xbf]/', $value)) list($value, $error) = array(preg_replace('/\xef\xb7[\x90-\xaf]|\xef\xbf[\xbe\xbf]/', " ", $value), "forbidden utf-8 character. input=$value"); $value = preg_replace('/\xc2\xad/', '', $value); # Kill invisible soft hyphens |