From ff8b1a10413c34781a52e2a6fa1b0d6df6569fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?= <jose.zap@gmail.com> Date: Sat, 4 Dec 2010 13:50:26 -0430 Subject: [PATCH] Stating to move loggers to the new folder --- lib/Cake/Error/ErrorHandler.php | 7 +------ lib/Cake/I18n/I18n.php | 4 ++-- cake/libs/cake_log.php => lib/Cake/Log/CakeLog.php | 0 .../log/file_log.php => lib/Cake/Log/Engine/FileLog.php | 0 4 files changed, 3 insertions(+), 8 deletions(-) rename cake/libs/cake_log.php => lib/Cake/Log/CakeLog.php (100%) rename cake/libs/log/file_log.php => lib/Cake/Log/Engine/FileLog.php (100%) diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php index 732b6328d..7dcdb6931 100644 --- a/lib/Cake/Error/ErrorHandler.php +++ b/lib/Cake/Error/ErrorHandler.php @@ -21,6 +21,7 @@ */ App::uses('Debugger', 'Utility'); +App::uses('CakeLog', 'Log'); /** * @@ -109,9 +110,6 @@ class ErrorHandler { App::import('Core', 'error/ExceptionRenderer'); $config = Configure::read('Exception'); if (!empty($config['log'])) { - if (!class_exists('CakeLog')) { - require LIBS . 'cake_log.php'; - } CakeLog::write(LOG_ERR, '[' . get_class($exception) . '] ' . $exception->getMessage()); } if ($config['renderer'] !== 'ExceptionRenderer') { @@ -158,9 +156,6 @@ class ErrorHandler { ); return Debugger::getInstance()->outputError($data); } else { - if (!class_exists('CakeLog')) { - require LIBS . 'cake_log.php'; - } $message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']'; if (!empty($errorConfig['trace'])) { $trace = Debugger::trace(array('start' => 1, 'format' => 'log')); diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php index bab553d1a..b85d9b75b 100644 --- a/lib/Cake/I18n/I18n.php +++ b/lib/Cake/I18n/I18n.php @@ -21,8 +21,8 @@ /** * Included libraries. */ -App::uses('L10n', 'Core'); -App::uses('Multibyte', 'Core'); +App::uses('L10n', 'I18n'); +App::uses('Multibyte', 'I18n'); /** * I18n handles translation of Text and time format strings. diff --git a/cake/libs/cake_log.php b/lib/Cake/Log/CakeLog.php similarity index 100% rename from cake/libs/cake_log.php rename to lib/Cake/Log/CakeLog.php diff --git a/cake/libs/log/file_log.php b/lib/Cake/Log/Engine/FileLog.php similarity index 100% rename from cake/libs/log/file_log.php rename to lib/Cake/Log/Engine/FileLog.php