cakephp2-php8/cake/tests/cases/libs/controller
mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
..
components Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 2010-09-24 23:27:22 -04:00
component.test.php Starting to update a test that was previously marked incomplete. 2010-08-11 23:08:46 -04:00
component_collection.test.php Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor. 2010-09-14 22:52:51 -04:00
controller.test.php Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 2010-09-24 23:27:22 -04:00
controller_merge_vars.test.php Fixing skips in ControllerMergeVarsTest. 2010-06-24 22:53:48 -04:00
pages_controller.test.php Added RequestObject output in place of Controller:$output whicch no longer exists. 2010-08-28 15:15:23 +10:00
scaffold.test.php Fixing + adding imports for Scaffold. 2010-09-08 00:11:37 -04:00