mark_story 7259a1b920 Merge branch '1.2' into 1.2-merger ... Conflicts: cake/libs/model/datasources/dbo/dbo_mysql.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/helpers/text.php cake/libs/view/theme.php		2009-12-06 21:43:53 -05:00
..
elements	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
errors	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
helpers	Merge branch '1.2' into 1.2-merger	2009-12-06 21:43:53 -05:00
layouts	Updating core layout, and skel layout to reflect changes in session->flash().	2009-11-16 20:01:55 -05:00
pages	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
scaffolds	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
helper.php	Adding new Configure::$App['www_root']	2009-11-26 14:52:38 -06:00
media.php	Correcting constructor of MediaView to fix issues with viewVars not being set.	2009-12-01 09:50:27 -05:00
theme.php	Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370	2009-11-30 09:19:25 -05:00
view.php	Increasing code coverage for View and ThemeView	2009-11-25 23:17:15 -06:00