Skip to content
Permalink
Browse files

Fixing + adding imports for Scaffold.

  • Loading branch information...
markstory committed Sep 8, 2010
1 parent 58d62cb commit 5d703c4f503a9f65dfb6ee5cb8d5f8fb57eea4d7
@@ -462,9 +462,7 @@ protected function _associations() {
* @package cake
* @subpackage cake.cake.libs.controller
*/
if (!class_exists('ThemeView')) {
App::import('View', 'Theme');
}
App::import('View', 'Theme');
/**
* ScaffoldView provides specific view file loading features for scaffolded views.
@@ -17,6 +17,7 @@
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::import('View', 'View');
/**
* Theme view class
@@ -17,7 +17,8 @@
* @since CakePHP(tm) v 1.2.0.5436
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
App::import('Core', 'Scaffold');
App::import('Core', 'Scaffold', false);
App::import('Core', 'Controller', false);
/**
* ScaffoldMockController class
@@ -789,7 +790,7 @@ function testScaffoldChangingViewProperty() {
$this->Controller->theme = 'test_theme';
$this->Controller->view = 'Theme';
$this->Controller->constructClasses();
$Scaffold =& new TestScaffoldMock($this->Controller, array());
$Scaffold =& new TestScaffoldMock($this->Controller, $this->Controller->request);
$this->assertEqual($this->Controller->view, 'Scaffold');
}

0 comments on commit 5d703c4

Please sign in to comment.
You can’t perform that action at this time.