From 98d31bf3d260c1d0aebe88cb35404a0338fe144f Mon Sep 17 00:00:00 2001
From: Christian A. Weber
Date: Tue, 18 Feb 2014 14:32:22 +0100
Subject: it::any2utf8() only warns about double utf8-encoding if $errprefix is
 not empty

---
 it.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'it.class')

diff --git a/it.class b/it.class
index 2b325b8..91c10c1 100644
--- a/it.class
+++ b/it.class
@@ -436,7 +436,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)), "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 ? "$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");
 		if ($error && $errprefix)
-- 
cgit v1.2.3