From 922d9865fa22685b3f1ffada0158cf1446b5a761 Mon Sep 17 00:00:00 2001 From: ADmad Date: Tue, 23 Oct 2012 13:15:08 +0530 Subject: [PATCH] Moving multibyte encoding setting to bootstrap.php. Closes #3290 --- lib/Cake/I18n/I18n.php | 7 ------- lib/Cake/bootstrap.php | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php index 7678ba6ae..862414b7c 100644 --- a/lib/Cake/I18n/I18n.php +++ b/lib/Cake/I18n/I18n.php @@ -24,13 +24,6 @@ App::uses('CakePlugin', 'Core'); App::uses('L10n', 'I18n'); App::uses('Multibyte', 'I18n'); -if (function_exists('mb_internal_encoding')) { - $encoding = Configure::read('App.encoding'); - if (!empty($encoding)) { - mb_internal_encoding($encoding); - } -} - /** * I18n handles translation of Text and time format strings. * diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 2c013b2d5..cd537cb5c 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -145,6 +145,12 @@ App::$bootstrapping = true; Configure::bootstrap(isset($boot) ? $boot : true); +if (function_exists('mb_internal_encoding')) { + $encoding = Configure::read('App.encoding'); + if (!empty($encoding)) { + mb_internal_encoding($encoding); + } +} /** * Full url prefix