Commit graph

9091 commits

Author SHA1 Message Date
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
a4746c7227 Applying patch from 'kworr' to reorder the switch in DboPostgres::value() to fix issues with pgsql 9.0. Fixes #1139 2010-09-24 22:47:18 -04:00
mark_story
8cd266c77f Correcting example in doc block. Fixes #1132 2010-09-24 22:23:24 -04:00
mark_story
9e4c890082 Updating the schema command in the core.php files to reflect the correct command needed for 1.3. Fixes #1031 2010-09-23 23:12:20 -04:00
ADmad
e161b41e3c CakeSession::__write() now correctly uses the Session model's primaryKey instead of hardcoded fieldname "id". Fixed #1129 2010-09-23 14:00:59 +05:30
mark_story
7e4f9c4953 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-09-21 21:14:23 -04:00
mark_story
ce1115b0b4 Adding I18n::clear() to remove most of the private variable access from the i18n test case.
Changing casing of classname in test case.
2010-09-21 21:13:45 -04:00
0x20h
2eac24c31a removed destructor, caching is done on file loading (fixes and improves #1085)
Signed-off-by: mark_story <mark@mark-story.com>
2010-09-21 21:03:36 -04:00
0x20h
ba8280423d * changed indexing order of the i18n __domains array to allow caching by domain+language (fixes #1085)
* adapted testcase

Signed-off-by: mark_story <mark@mark-story.com>
2010-09-21 21:03:29 -04:00
mark_story
729a45703b Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121 2010-09-21 20:34:27 -04:00
ADmad
b9a7b27ba1 Fixing regression cased by commit d5ffdc288d causing ajax layout to be not auto set for ajax request for html pages. Refs #1099 2010-09-21 00:25:17 +05:30
mark_story
b648b61422 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-09-19 18:32:07 -04:00
mark_story
c3d5c3fd00 Fixing issue in Cache where duration = 0 would not read/write from cache. This prevented the creation of non expiring cache entries in APC and memcache.
Adding a return false to FileEngine as it was omitted in the past.
Fixes #1120
2010-09-19 12:20:07 -04:00
ADmad
e10d634f91 Mails sent using php's "mail()" function now have header fields terminated by CRLF and body too contains CR and LF only as combination CRLF in compliannce with RFC 2822. Closes #1071 2010-09-19 03:54:32 +05:30
mark_story
443e523313 Adding tests for clearing the cache with memcache. 2010-09-18 13:15:37 -04:00
mark_story
7518d0e804 Removing dead code in Cache.
Adding tests for ApcEngine::clear().
2010-09-18 12:52:08 -04:00
mark_story
b6d845adc4 Updating calls of Cache::set() inside Cache. Updating the documentation for set() so it better explains how the temporary settings work.
Updating APC and Memcache engine tests to reflect the lack of state being stored inside Cache.
2010-09-18 12:32:43 -04:00
mark_story
5e725e62ca Making MemcacheEngine match the interface. 2010-09-18 11:11:51 -04:00
mark_story
b432e60971 Making Cache::set() work with 2 or 3 parameters. Test cases added. 2010-09-18 11:11:28 -04:00
mark_story
1eb746bf7e Fixing fatal error caused by missing argument. 2010-09-18 11:10:35 -04:00
ADmad
d5ffdc288d Including RequestHandler in controller now automatically sends proper content-type and encoding headers for html pages too like it does for other known file types. Closes #1099 2010-09-18 20:20:52 +05:30
mark_story
9ccbe5e269 Removing unnecessary call to config(). 2010-09-18 00:46:26 -04:00
mark_story
dc65f2306b Making Cache methods always need a config name. This allows the removal of hidden and often confusing state that gets remembered by Cache each time config() is called. Removing the hidden state makes Cache more predictable. 2010-09-18 00:45:29 -04:00
Joe Beeson
b9163b95fe Added a warning that will appear on the homepage to alert users that
their PCRE installation doesn't have Unicode support which can cause a
whole mess of trouble if gone unnoticed. The warning will only display
if their system doesn't have support, not if it does. Fixes #1113

Signed-off-by: mark_story <mark@mark-story.com>
2010-09-18 00:17:51 -04:00
mark_story
e91fa68f8e Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105 2010-09-18 00:13:03 -04:00
mark_story
d113d7d612 Removing dead code from DboSource::fields()
Updating fields() to use implode, so complex virtual fields are better handled.  Fixes #1079
2010-09-18 00:04:36 -04:00
mark_story
738d92cc3e Fixing failing tests caused by fixture data changes. 2010-09-18 00:03:22 -04:00
mark_story
5a8648cca0 Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930 2010-09-16 00:17:09 -04:00
mark_story
1707c92aa1 Removing duplicated code. 2010-09-14 23:15:10 -04:00
mark_story
c255539980 Removing assignment of reference to theme view.
Removing cruft in ThemeView test.
2010-09-14 23:13:00 -04:00
mark_story
f34cfd1f1e Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference.
Removing triggerDisabled key as its no longer needed or wanted.
2010-09-14 23:02:38 -04:00
mark_story
273a189e98 Adding some documentation about component callbacks. 2010-09-14 23:01:39 -04:00
mark_story
30589e2cdf Removing dead method. 2010-09-14 22:56:33 -04:00
mark_story
0ef76eb69a Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor. 2010-09-14 22:52:51 -04:00
mark_story
7a14d3a8f2 Fixing issue where mockObject expectations were not counted hiding fails. Fixing all objects not actually being iterated. 2010-09-14 22:40:46 -04:00
mark_story
5d697b9d6e Fixing tests where objects were not added to the mockObjects lists, making their expects() not count. 2010-09-14 22:39:05 -04:00
mark_story
8e97a5ee2d Fixing failing tests caused by missing index in Security component testcase. 2010-09-14 22:20:30 -04:00
mark_story
0baaf6801b Removing call to RequestHandler as its just a pass through to the request object which is available in that scope. Updating the test cases to not use deprecated and non-existent things. 2010-09-14 22:12:14 -04:00
mark_story
97dd7c7644 Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated. 2010-09-14 21:57:40 -04:00
mark_story
285876c7e7 Adding po files omitted from previous commit. Refs #1085 2010-09-14 21:16:57 -04:00
mark_story
2906927a16 Adding BC wrappers for helpers.
Updating paginator test case to use non deprecated properties.
2010-09-13 23:12:00 -04:00
mark_story
003d02d8d9 Making view test pass by moving property assignment on mock. 2010-09-13 23:11:59 -04:00
mark_story
e4b2fb173b Removing the deprecated properties.
Removing property copying to helpers.
Making the view test cases pass again.
2010-09-13 23:11:59 -04:00
mark_story
634cea24eb Adding 'action' into View::__get() to make an integration test pass. 2010-09-13 23:11:59 -04:00
mark_story
a521291afd Adding a __set() method to make some tests pass.
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
2010-09-13 23:11:59 -04:00
mark_story
84565151de Removing all the deprecated properties from Controller.
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
2010-09-13 23:11:59 -04:00
mark_story
c7fb20d13a Reformatting doc block indentation. 2010-09-13 23:09:00 -04:00
mark_story
834c44b303 Fixing return value tag. 2010-09-13 23:06:15 -04:00
mark_story
d7bb7699e2 Applying patch from '0x20h' to fix issue where domain translation files would be mixed together causing duplicate data in the various cache files. There should now be one cache per domain + language. Fixes #1085 2010-09-13 22:17:05 -04:00
Juan Basso
ef147275d7 Added test to use Xml with Model. 2010-09-13 00:43:11 -03:00