Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 922d9865fa22685b3f1ffada0158cf1446b5a761 1 parent 746eaf9
@ADmad ADmad authored
Showing with 6 additions and 7 deletions.
  1. +0 −7 lib/Cake/I18n/I18n.php
  2. +6 −0 lib/Cake/bootstrap.php
View
7 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.
*
View
6 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
Please sign in to comment.
Something went wrong with that request. Please try again.