cakephp2-php8/cake/tests/cases/libs/controller
mark_story 3ea8c2246a Merge branch '1.3' into merger
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/cookie.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/lib/cake_test_fixture.php
2011-03-01 22:21:44 -05:00
..
components Merge branch '1.3' into merger 2011-03-01 22:21:44 -05:00
component.test.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
component_collection.test.php Fixed aliasing so it works with plugins in the 'className' key 2011-01-14 17:44:33 -08:00
controller.test.php Removing $request->query[url]. This simulated value is also available at $request->url, and having it in the query array confuses things, as GET[url] no longer exists. 2011-02-20 21:52:20 -05:00
controller_merge_vars.test.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
pages_controller.test.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
scaffold.test.php Removing $request->query[url]. This simulated value is also available at $request->url, and having it in the query array confuses things, as GET[url] no longer exists. 2011-02-20 21:52:20 -05:00