phpnut 8a77108c44 Merging fixes to trunk ... Revision: [1809] Fixed self join code, may refactor after looking at it more. Currently it is working as expected. Fixed errors in scaffold view caused by the changes I made. Removed adding Child_ prefix to self joined associations. Revision: [1808] Adding changes I started on the self join code. Revision: [1807] Adding patch from Ticket #283. Changed doc comment in SessionComponent class. Added fix for Ticket #285 git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1810 3807eeeb-6ff5-0310-8944-8be069107fe0		2006-01-16 21:34:46 +00:00
..
controller	Merging fixes to trunk	2006-01-16 21:34:46 +00:00
model	Merging fixes to trunk	2006-01-16 21:34:46 +00:00
view	Merging fixes to trunk	2006-01-16 21:34:46 +00:00
bake.php	Merging:	2005-12-27 03:33:44 +00:00
cache.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
class_registry.php	Merging changes to trunk:	2006-01-12 02:10:47 +00:00
error.php	Merging fixes to trunk	2006-01-13 23:53:23 +00:00
file.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
flay.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
folder.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
inflector.php	Merged:	2005-12-29 06:58:11 +00:00
legacy.php	Merging changes to the trunk.	2005-12-23 21:57:26 +00:00
log.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
neat_array.php	Merging:	2005-12-27 03:33:44 +00:00
neat_string.php	Merging:	2005-12-27 03:33:44 +00:00
object.php	Merging changes into trunk	2006-01-12 03:56:59 +00:00
router.php	Updated VERSION file	2005-12-27 17:14:32 +00:00
sanitize.php	Merging:	2005-12-27 03:33:44 +00:00
security.php	Merging changes to the trunk.	2005-12-23 21:57:26 +00:00
session.php	Merging fixes to trunk	2006-01-15 12:18:57 +00:00
validators.php	Merging changes to the trunk.	2005-12-23 21:57:26 +00:00