Merge branch '1.3' into 1.3-logging

This commit is contained in:
mark_story 2009-09-07 22:41:31 -04:00
commit 11ceae2e96

View file

@ -28,8 +28,7 @@
if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
define('CAKEPHP_UNIT_TEST_EXECUTION', 1); define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
} }
App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql')); App::import('Model', array('Model', 'DataSource', 'DboSource', 'DboMysql', 'App'));
App::import('Model', 'App');
require_once dirname(dirname(__FILE__)) . DS . 'models.php'; require_once dirname(dirname(__FILE__)) . DS . 'models.php';
/** /**