Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 922d9865fa22685b3f1ffada0158cf1446b5a761 1 parent 746eaf9
ADmad authored October 23, 2012
7  lib/Cake/I18n/I18n.php
@@ -24,13 +24,6 @@
24 24
 App::uses('L10n', 'I18n');
25 25
 App::uses('Multibyte', 'I18n');
26 26
 
27  
-if (function_exists('mb_internal_encoding')) {
28  
-	$encoding = Configure::read('App.encoding');
29  
-	if (!empty($encoding)) {
30  
-		mb_internal_encoding($encoding);
31  
-	}
32  
-}
33  
-
34 27
 /**
35 28
  * I18n handles translation of Text and time format strings.
36 29
  *
6  lib/Cake/bootstrap.php
@@ -145,6 +145,12 @@
145 145
 
146 146
 Configure::bootstrap(isset($boot) ? $boot : true);
147 147
 
  148
+if (function_exists('mb_internal_encoding')) {
  149
+	$encoding = Configure::read('App.encoding');
  150
+	if (!empty($encoding)) {
  151
+		mb_internal_encoding($encoding);
  152
+	}
  153
+}
148 154
 
149 155
 /**
150 156
  *  Full url prefix

0 notes on commit 922d986

Please sign in to comment.
Something went wrong with that request. Please try again.