Permalink
Browse files

Move registration of CakePlugin.

Move the uses() call to Cake/bootstrap.php
CakePlugin is used by App, and should be loaded along with
other core classes like Configure and Cache.

Fixes #2147
  • Loading branch information...
1 parent e457c14 commit 205d75587ce26bf87c4792d64b8eff277c1901df @markstory markstory committed Oct 23, 2011
Showing with 1 addition and 1 deletion.
  1. +0 −1 lib/Cake/Core/App.php
  2. +1 −0 lib/Cake/bootstrap.php
View
1 lib/Cake/Core/App.php
@@ -739,7 +739,6 @@ public static function init() {
self::$_map += (array)Cache::read('file_map', '_cake_core_');
self::$_objects += (array)Cache::read('object_map', '_cake_core_');
register_shutdown_function(array('App', 'shutdown'));
- self::uses('CakePlugin', 'Core');
}
/**
View
1 lib/Cake/bootstrap.php
@@ -130,6 +130,7 @@
App::uses('ErrorHandler', 'Error');
App::uses('Configure', 'Core');
+App::uses('CakePlugin', 'Core');
App::uses('Cache', 'Cache');
App::uses('Object', 'Core');
App::$bootstrapping = true;

0 comments on commit 205d755

Please sign in to comment.