Skip to content
Permalink
Browse files

Conditionally use Cake's ClassLoader

We don't need it if composer's autoloader is working.
  • Loading branch information...
markstory committed Nov 2, 2012
1 parent cd21ea3 commit c0fcb715a47198fea7d44c6490b189315ad748c3
Showing with 6 additions and 3 deletions.
  1. +6 −3 lib/Cake/bootstrap.php
@@ -21,9 +21,12 @@
define('TIME_START', microtime(true));
require CAKE . 'basics.php';
require CAKE . 'Core/ClassLoader.php';
$loader = new \Cake\Core\ClassLoader('Cake', CORE_PATH);
$loader->register();
if (!class_exists('Cake\Core\App')) {
require CAKE . 'Core/ClassLoader.php';
$loader = new \Cake\Core\ClassLoader('Cake', CORE_PATH);
$loader->register();
}
use Cake\Core\App;
use Cake\Core\Configure;

0 comments on commit c0fcb71

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