mark_story c8cf1a2c5b Updating __mergeVars to correctly merge parent and child component configurations. ... Applied patch from 'neilcrookes'. Test case added. Fixes #6325 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0		2009-04-28 01:32:20 +00:00
..
components	Fixing lost querystring params when user request without a session is performed. Test case updated. Fixes #6211	2009-04-25 02:16:05 +00:00
app_controller.php	changing tabs for spaces in comment block indentation	2008-10-30 17:30:26 +00:00
component.php	updating code from [8024] [8025]	2009-02-15 20:13:14 +00:00
controller.php	Updating __mergeVars to correctly merge parent and child component configurations.	2009-04-28 01:32:20 +00:00
pages_controller.php	changing tabs for spaces in comment block indentation	2008-10-30 17:30:26 +00:00
scaffold.php	Updating documentation to improve code completion	2009-03-17 21:10:28 +00:00