Jose Lorenzo Rodriguez
|
d83555cc52
|
Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
|
2011-05-04 01:10:23 -04:30 |
|
mark_story
|
63275626ee
|
Adding backwards compatible cookie reading back into CookieComponent.
Cookie values using the 1.x formatting will be read, and upon next write
be converted to json encoded values.
Fixes #1593
|
2011-04-18 22:07:45 -04:00 |
|
mark_story
|
d4ff39206a
|
Making CookieComponent use json_encode instead of a custom
serialization. Fixes issues where values containing | or , would be
handled incorrectly. Fixes #1593
|
2011-04-18 22:07:45 -04:00 |
|
Jose Lorenzo Rodriguez
|
0263ffc74e
|
Renaming tests folders and making tests runnable again
|
2011-04-10 20:08:24 -04:30 |
|