mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Moving multibyte encoding setting to bootstrap.php. Closes #3290
This commit is contained in:
parent
746eaf9389
commit
922d9865fa
2 changed files with 6 additions and 7 deletions
|
@ -24,13 +24,6 @@ App::uses('CakePlugin', 'Core');
|
||||||
App::uses('L10n', 'I18n');
|
App::uses('L10n', 'I18n');
|
||||||
App::uses('Multibyte', '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.
|
* I18n handles translation of Text and time format strings.
|
||||||
*
|
*
|
||||||
|
|
|
@ -145,6 +145,12 @@ App::$bootstrapping = true;
|
||||||
|
|
||||||
Configure::bootstrap(isset($boot) ? $boot : 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
|
* Full url prefix
|
||||||
|
|
Loading…
Reference in a new issue