From bb3edf12d0ca82c62f7b7d570108375ec4379749 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 20 Feb 2014 17:51:41 +0200 Subject: CI_Utf8-related changes - Give priority to mb_convert_encoding() over iconv() in clean_string() (partially fixes #261) - Add more proper unit tests --- tests/mocks/core/utf8.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/mocks/core') diff --git a/tests/mocks/core/utf8.php b/tests/mocks/core/utf8.php index c8214a62a..3a6282e1d 100644 --- a/tests/mocks/core/utf8.php +++ b/tests/mocks/core/utf8.php @@ -5,12 +5,15 @@ class Mock_Core_Utf8 extends CI_Utf8 { /** * We need to define UTF8_ENABLED the same way that * CI_Utf8 constructor does. - * - * @covers CI_Utf8::__construct() */ public function __construct() { - defined('UTF8_ENABLED') OR define('UTF8_ENABLED', TRUE); + if (defined('UTF8_ENABLED')) + { + return; + } + + parent::__construct(); } } \ No newline at end of file -- cgit v1.2.3-24-g4f1b