Moving multibyte encoding setting to bootstrap.php. Closes #3290

cakephp · Oct 23, 2012 · 922d986 · 922d986
1 parent 746eaf9
commit 922d986
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php
@@ -24,13 +24,6 @@
 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
@@ -145,6 +145,12 @@
 
 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