mark_story b9f0fc0724 Merge branch '1.3' into merger ... Conflicts: cake/dispatcher.php cake/libs/cake_session.php cake/libs/controller/components/cookie.php cake/libs/controller/components/email.php cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/set.php cake/libs/validation.php cake/libs/view/view.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/validation.test.php cake/tests/cases/libs/view/view.test.php		2010-12-10 22:24:31 -05:00
..
email	Merge branch '1.3' into merger	2010-12-10 22:24:31 -05:00
nocache	Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.	2010-11-07 13:23:45 -05:00
empty	Moving Cake folder to correct location	2008-05-30 11:40:08 +00:00
html_call.ctp	Adding test cases for using helpers in nested elements from email	2010-12-09 22:34:20 -05:00
session_helper.ctp	Updating SessionHelper::flash() to use elements for custom flash wrapping html instead of layouts.	2009-09-01 00:03:56 -04:00
test_element.ctp	adding test case to #4980, proving cake:nocache bug	2008-06-26 05:26:10 +00:00
type_check.ctp	Changing View::element() to not overwrite viewVars with helpers that	2010-12-09 22:06:23 -05:00