cakephp2-php8/cake/libs/controller
mark_story e149c411fb Merge branch '1.3' into merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/shells/tasks/template.php
	cake/dispatcher.php
	cake/libs/controller/component.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
..
components Merge branch '1.3' into merger 2011-02-05 12:20:09 -05:00
app_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_error_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
component.php Fix to resolve 'assign by reference' errors when using a '__get' magic method. 2011-01-21 15:52:03 -05:00
component_collection.php Removing a pointless import in CakeRequest. 2011-02-05 01:28:41 -05:00
controller.php Implemented the beforeRedirect callback in controller. 2011-01-20 21:27:40 -02:00
pages_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
scaffold.php Fixing incorrectly nested sprintf + __ call. Refs #1305 2011-01-30 12:25:40 -05:00