adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-04 18:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/bootstrap.php
This commit is contained in:
ADmad 2012-10-23 16:53:01 +05:30
commit 1763f46340
8 changed files with 85 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/bootstrap.php
View file

@ -129,14 +129,10 @@ if (!defined('JS_URL')) {
define('JS_URL', 'js/');
}
require CAKE . 'basics.php';
require CAKE . 'Core' . DS . 'App.php';
require CAKE . 'Error' . DS . 'exceptions.php';
/**
* Full url prefix
*/
@ -165,3 +161,9 @@ App::$bootstrapping = 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);
}
}