Merge pull request #760 from zoghal/fix-2-3-full-url

Full url prefix is better defined before auto loading
This commit is contained in:
Mark Story 2012-08-09 17:37:40 -07:00
commit 0322e808a7

View file

@ -126,21 +126,12 @@ if (!defined('JS_URL')) {
} }
require CAKE . 'basics.php'; require CAKE . 'basics.php';
require CAKE . 'Core' . DS . 'App.php'; require CAKE . 'Core' . DS . 'App.php';
require CAKE . 'Error' . DS . 'exceptions.php'; require CAKE . 'Error' . DS . 'exceptions.php';
spl_autoload_register(array('App', 'load'));
App::uses('ErrorHandler', 'Error');
App::uses('Configure', 'Core');
App::uses('CakePlugin', 'Core');
App::uses('Cache', 'Cache');
App::uses('Object', 'Core');
App::$bootstrapping = true;
Configure::bootstrap(isset($boot) ? $boot : true);
/** /**
* Full url prefix * Full url prefix
@ -158,3 +149,15 @@ if (!defined('FULL_BASE_URL')) {
} }
unset($httpHost, $s); unset($httpHost, $s);
} }
spl_autoload_register(array('App', 'load'));
App::uses('ErrorHandler', 'Error');
App::uses('Configure', 'Core');
App::uses('CakePlugin', 'Core');
App::uses('Cache', 'Cache');
App::uses('Object', 'Core');
App::$bootstrapping = true;
Configure::bootstrap(isset($boot) ? $boot : true);