diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index 2d97bcfd9..9d47dd759 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -15,6 +15,10 @@ App::uses('Hash', 'Utility'); App::uses('ConfigReaderInterface', 'Configure'); +/** + * Compatibility with 2.1, which expects Configure to load Set. + */ +App::uses('Set', 'Utility'); /** * Configuration class. Used for managing runtime configuration information. diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 08cb5d2ea..40ac76b4d 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -141,10 +141,6 @@ App::$bootstrapping = true; Configure::bootstrap(isset($boot) ? $boot : true); -/** - * Compatibility with 2.1, which expects Set to always be autoloaded. - */ -App::uses('Set', 'Utilty'); /** * Full url prefix