Ceeram
eba0b1f999
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-03-28 22:34:31 +02:00
Ceeram
7df6477526
add test to prove #2723
2012-03-28 22:24:02 +02:00
José Lorenzo Rodríguez
c67feb0629
Merge pull request #589 from shama/patch-substr-optimizations
...
substr() optimizations throughout core
2012-03-28 13:23:16 -07:00
Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
ADmad
47558e8db5
Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723
...
This reverts commit 96f73d6392
, reversing
changes made to 9d017c2b5c
.
Conflicts:
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2012-03-29 01:33:21 +05:30
Kyle Robinson Young
33ab634aba
Controller $name set optimization
2012-03-28 11:37:27 -07:00
Kyle Robinson Young
4370bf280a
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
...
Fixes #2602
2012-03-28 10:46:31 -07:00
Rachman Chavik
6fa30db504
CakeEmail can use theme when rendering template
2012-03-28 22:01:30 +07:00
Kyle Robinson Young
319d154aee
Default to loginRedirect, if set, on authError in AuthComponent
...
Implements #2390
Based on the patch written by @dereuromark
2012-03-27 22:51:47 -07:00
Kyle Robinson Young
c700fedbf8
Update test suite header version to 2.2
...
Conflicts:
lib/Cake/TestSuite/templates/header.php
2012-03-27 19:52:58 -04:00
Mark Story
0443fe1507
Merge pull request #584 from shama/patch-inpath-test
...
Add test/doc for reverse Folder::inPath()
2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9
Add test/doc for reverse Folder::inPath()
2012-03-27 11:55:13 -07:00
Jose Lorenzo Rodriguez
4f6f041730
Using same serialization strategy for request object in cached views, this prevents some failing tests in environments
...
with different charsets
2012-03-27 00:57:15 -04:30
mark_story
c1531d3faa
Fix a few small code standards issues.
2012-03-26 23:04:32 -04:00
mark_story
6b045318d8
Merge branch '2.1' into 2.2
2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82
Fix Set::insert() not overwriting values.
...
Set::insert() failed to overwrite values that were previously
defined as strings. Remove test in SessionComponentTest that was
ensuring this bug stuck around.
Fixes #2722
2012-03-26 21:50:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Jose Lorenzo Rodriguez
43cf2f0647
Update version number to 2.1.1
2012-03-25 21:00:26 -04:30
Kyle Robinson Young
a905954484
Update test suite header version to 2.1
2012-03-25 10:36:30 -07:00
Kyle Robinson Young
b8705a71fb
Remove no longer needed empty file
2012-03-24 21:46:32 -07:00
mark_story
49a455a2cb
Fix some code standards warnings.
2012-03-24 22:15:08 -04:00
ADmad
c847ec216c
Changing assetEqual() to assertEquals()
2012-03-25 04:27:57 +05:30
mark_story
fca8b1dd30
Fix issue where requestAction() would not strip base url.
...
requestAction + Controller::referer() don't work well together.
Stripping the base domain, and normalizing the URL gives an application
request which works much better. This keeps RequestHandler more
transparent when overloading redirects.
Fixes #2711
2012-03-24 18:11:07 -04:00
Thomas Ploch
68e4e0e7ae
Revert "Added TestCakeSession::clear() to CakeSessionTest teardown."
...
This reverts commit b346ac961c
.
2012-03-24 21:43:25 +01:00
Thomas Ploch
b346ac961c
Added TestCakeSession::clear() to CakeSessionTest teardown.
2012-03-24 21:41:19 +01:00
Thomas Ploch
fda065101b
Fixed test cases for successful being built on travis.
2012-03-24 21:32:31 +01:00
Jose Lorenzo Rodriguez
16bde9c723
Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705
2012-03-24 14:34:29 -04:30
mark_story
83ceef045d
Removing tests that fail on Postgres and Sqlite.
...
Fixes #2174
2012-03-23 21:21:18 -04:00
dogmatic69
7c697eb9be
adding an extra check to only type cast if its a int/true/false so you can still use fields etc in the queries
2012-03-23 21:21:18 -04:00
dogmatic69
a5685947b9
Adding failing tests for bool updates switching with the field name
2012-03-23 21:21:08 -04:00
ADmad
4b49a287a6
Show plugin name in error message if a plugin component was requested
2012-03-24 00:22:50 +05:30
Ceeram
817015e6b3
remove unneccesary elseif
2012-03-23 16:37:02 +01:00
Ceeram
d748fc7451
Merge branch '2.1' into 2.2
2012-03-23 16:32:04 +01:00
Ceeram
4a6159c9af
session_cache_limiter() removed, it was set to invalid value as well
...
Also remove setting P3P header
2012-03-23 16:31:26 +01:00
José Lorenzo Rodríguez
3a4d173ce2
Merge pull request #577 from shama/patch-assert-order
...
Correct parameter order of assertEquals and assertNotEquals
2012-03-23 06:57:02 -07:00
Kyle Robinson Young
21c4967cc6
App::uses the File Utility as write() uses File
2012-03-22 23:48:57 -07:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
mark_story
34e1afd8ef
Add support for custom console error handling
...
Both errors and exceptions can be configured for the console
at the application layer now.
Fixes #2696
2012-03-22 20:52:49 -04:00
mark_story
3851ad08a6
Fix code standards warnings.
2012-03-21 21:56:53 -04:00
mark_story
69e63b11a4
Change method to only return true/false.
...
null/true/false is complicated. Fix issues with some
of the test fixtures. imalsonotrequired was actually required
as it's last rule didn't specify allowEmpty = true and had a range
validation rule.
2012-03-21 21:06:49 -04:00
Thomas Ploch
cabb0d00ac
Added support for 'on' validation key in FormHelper. Fixes #2169 .
2012-03-21 21:06:49 -04:00
mark_story
20bdf1d7b0
Add escaping to table names.
...
SQLite was not quoting table names, so tables with
keywords caused errors.
Fixes #2702
2012-03-21 21:04:34 -04:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
Ceeram
0a94202fb6
fixing test of previous commit
2012-03-21 11:07:51 +01:00
Ceeram
4dfbfe9c8b
fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array
2012-03-21 10:38:04 +01:00
mark_story
01e035f726
Move logic to afterDelete.
...
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.
Fixes #2699
2012-03-20 22:36:48 -04:00
Mark Story
3abb7d966b
Merge pull request #569 from tPl0ch/2.2-datasource-close
...
Adding basic implementation of DataSource::close().
2012-03-20 18:06:00 -07:00
Mark Story
57babc87b0
Merge pull request #570 from dogmatic69/2111
...
Add regex option to String::highlight()
Fixes #2111
2012-03-20 17:39:54 -07:00
Kyle Robinson Young
db9c3e5bf3
Remove unused code and correct doc for modelClass
2012-03-20 14:44:14 -07:00
Ceeram
247f5522c6
add test for saveAll deep
2012-03-20 20:41:41 +01:00