Merge remote branch 'origin/1.3' into 1.3

This commit is contained in:
predominant 2010-01-05 23:24:12 +11:00
commit 71dbd9bd32

View file

@ -2115,7 +2115,9 @@ class DispatcherTest extends CakeTestCase {
$_SERVER['PHP_SELF'] = '/'; $_SERVER['PHP_SELF'] = '/';
Router::reload(); Router::reload();
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::build(array(
'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
));
$dispatcher =& new Dispatcher(); $dispatcher =& new Dispatcher();
$dispatcher->base = false; $dispatcher->base = false;