From be1496d1a8618ef186047468009c7e3e0640183b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 11 Feb 2014 22:48:45 +0200 Subject: Utf8/iconv/mbstring-related changes --- tests/mocks/core/utf8.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/mocks/core/utf8.php') diff --git a/tests/mocks/core/utf8.php b/tests/mocks/core/utf8.php index a43138fbc..9dda43aec 100644 --- a/tests/mocks/core/utf8.php +++ b/tests/mocks/core/utf8.php @@ -16,11 +16,22 @@ class Mock_Core_Utf8 extends CI_Utf8 { { defined('MB_ENABLED') OR define('MB_ENABLED', TRUE); mb_internal_encoding('UTF-8'); + ini_set('mbstring.substitute_character', 'none'); } else { defined('MB_ENABLED') OR define('MB_ENABLED', FALSE); } + + if (extension_loaded('iconv')) + { + defined('ICONV_ENABLED') OR define('ICONV_ENABLED', TRUE); + iconv_set_encoding('internal_encoding', 'UTF-8'); + } + else + { + defined('ICONV_ENABLED') OR define('ICONV_ENABLED', FALSE); + } } public function is_ascii_test($str) -- cgit v1.2.3-24-g4f1b