cakephp2-php8/cake/libs/view
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
..
elements Merge branch '2.0-exceptions' into 2.0 2010-09-10 20:31:16 -04:00
errors Adding stack traces to error400 and error500 when debug > 0. 2010-09-06 18:09:11 -04:00
helpers Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
layouts Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
pages 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
scaffolds Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
helper.php Adding BC wrappers for helpers. 2010-09-13 23:12:00 -04:00
helper_collection.php Removing the deprecated properties. 2010-09-13 23:11:59 -04:00
media.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
theme.php Removing assignment of reference to theme view. 2010-09-14 23:13:00 -04:00
view.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