Commit graph

9 commits

Author SHA1 Message Date
mark_story
dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
Mark Story
2b3099fa70 Removing duplicate method call. 2010-09-07 00:42:49 -04:00
predominant
a6b08c94d0 Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/libs/session/database_session.php
2010-09-06 23:57:36 +10:00
Mark Story
d54c901f5d Moving _setupDatabase() into the Database session class, as that's the only place its used. 2010-09-06 01:12:23 -04:00
Mark Story
27ae7f1f44 Making session storage classes not static, there was no real reason they were static before, and removing the static methods allows them to have constructors. This will allow moving database specific features from CakeSession to DatabaseSession. 2010-09-06 00:43:58 -04:00
predominant
465b15c64e Removing reference assignments. 2010-08-29 23:09:33 +10:00
mark_story
28b9ed7264 Adding test cases for DatabaseSession and fixing a test case in CacheSession. 2010-07-27 22:27:13 -04:00
mark_story
951eeae817 Extracting handler location into a method.
Moving DatabaseSession and CacheSession into separate files.  Tests to come soon.
2010-07-27 22:27:13 -04:00