2 commits

Author	SHA1	Message	Date
mark_story	51244907d1	Updating merge vars test to skip itself if run in a group context. ... Updating controller group.	2009-10-31 14:55:04 -04:00
mark_story	16eb51e91c	Adding ControllerMergeVarsTestCase to more extensively test merging of vars in Controller::__mergeVars. ... Fixing issue where components declared in AppController would get doubled settings if no components were declared in subclasses. Fixes #6459 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8201 3807eeeb-6ff5-0310-8944-8be069107fe0	2009-06-24 18:09:14 +00:00