Skip to content
Permalink
Browse files

Bootstrap Configure after the mb_* shims have been defined.

By bootstrapping after the shims have been defined allows the shims to
be used by Inflector which is often involved with bootstrapping.

Refs #7135
  • Loading branch information...
markstory committed Jul 30, 2015
1 parent 4d45281 commit 26ab829d5ad62e19c8de172a8dbfb0f1ad93da19
Showing with 12 additions and 11 deletions.
  1. +12 −11 lib/Cake/bootstrap.php
@@ -172,17 +172,6 @@
Configure::write('App.cssBaseUrl', CSS_URL);
Configure::write('App.jsBaseUrl', JS_URL);
Configure::bootstrap(isset($boot) ? $boot : true);
if (function_exists('mb_internal_encoding')) {
$encoding = Configure::read('App.encoding');
if (!empty($encoding)) {
mb_internal_encoding($encoding);
}
if (!empty($encoding) && function_exists('mb_regex_encoding')) {
mb_regex_encoding($encoding);
}
}
if (!function_exists('mb_stripos')) {
@@ -438,3 +427,15 @@ function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B',
}
}
Configure::bootstrap(isset($boot) ? $boot : true);
if (function_exists('mb_internal_encoding')) {
$encoding = Configure::read('App.encoding');
if (!empty($encoding)) {
mb_internal_encoding($encoding);
}
if (!empty($encoding) && function_exists('mb_regex_encoding')) {
mb_regex_encoding($encoding);
}
}

0 comments on commit 26ab829

Please sign in to comment.
You can’t perform that action at this time.