Jeremy Harris
2dac6d29c2
Clearing HABTM (unique) when HABTM array is empty, refs #2461
2014-08-28 17:52:13 -05:00
chinpei215
010bbc6764
Resolve ambiguous column names for Sqlite
2014-08-27 16:06:28 +09:00
chinpei215
c06b7162ef
Resolve ambiguous column names
2014-08-27 15:32:57 +09:00
chinpei215
31204832c2
Ensure that afterFind is called when using 'joins' with 'recursive' = -1
2014-08-27 15:16:13 +09:00
chinpei215
b74774bb0c
hasOne/belongsTo associations should contain associated records in afterFind
...
Before 1fe943d6f1
,
afterFind() is called twice with belongsTo/hasOne associations.
Although $results also doesn't contain associated records on first time,
it contains them on second time.
After 1fe943d6f1
,
it doesn't work if associated records are used in afterFind.
This commit fixes it.
2014-08-27 09:32:00 +09:00
Mark Story
5863adda42
Merge pull request #4405 from php-engineer/master-session-bugfix
...
CakeSession::delete() bugfix
2014-08-26 12:43:02 -04:00
Stefan Dickmann
66ccfaf5e2
session bugfix
2014-08-26 17:47:45 +02:00
David Yell
04a8053af6
Update TagFixture.php
...
Updated the tag fixture so that it doesn't break `CakeSchema::_arrayDiffAssoc()`
2014-08-26 14:53:31 +01:00
ADmad
ff3273d8eb
Merge pull request #4386 from cakephp/issue-4184
...
Fix CURRENT_TIMESTAMP being stored as a default value.
2014-08-25 21:06:41 +05:30
euromark
cc0acd1556
Fix CS.
2014-08-25 16:54:12 +02:00
mark_story
7936b5e764
Fix CURRENT_TIMESTAMP being stored as a default value.
...
When reflecting timestamp columns in MySQL current_timestamp comes back
as the default value. This causes insertion errors later on as
'current_timestamp' is an invalid value for timestamp columns.
Refs #4184
2014-08-25 11:17:11 +02:00
Mark Story
7a8cb4315e
Merge pull request #4366 from hmic/ticket#2707
...
Fixed i18n __*() bug
2014-08-24 17:25:30 +02:00
Hans-Joachim Michl
b4620b4c6c
Fixes #2707
...
When the first variable argument = null, but there are more arguments given.
Added testcases to show the change (to fail before the fix)
2014-08-24 14:27:49 +00:00
mathieu strauch
85cd11384a
fix failing testLogError
2014-08-24 15:46:44 +02:00
mark_story
f0f1531fac
Add test for #4309
...
The Router internals don't handle // which is good.
2014-08-24 12:13:05 +02:00
Jeremy Harris
8f420d74fa
HttpSocket: not overwriting auth header if it is set in request configuration
2014-08-21 11:24:10 -05:00
mark_story
0400a63004
Forward port fixes for #4294 from 1.3 to 2.x
...
CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
1969 on invalid input can be very confusing and un-helpful.
Refs #4294
2014-08-20 00:25:01 +02:00
euromark
07937d5a5f
Correct typo.
2014-08-19 13:49:34 +02:00
Brian Porter
9b9600fe18
CakeSchema naming fallback.
...
Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility.
Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.
2014-08-11 10:40:57 -05:00
mark_story
d114fa1431
Update join building to not error out on empty conditions.
...
When conditions are empty we can assume one of two things:
* The person made a mistake.
* The person is doing the join conditions in the where clause.
In both cases we should attempt to generate proper SQL.
Fixes #4189
2014-08-08 10:02:09 -04:00
José Lorenzo Rodríguez
64e74cbaac
Merge pull request #4175 from chinpei215/master-issue2268-fix
...
Fix afterFind() called twice with belongsTo and hasOne relationships
2014-08-06 10:48:45 +02:00
Mark Story
221fc862aa
Merge pull request #4140 from chinpei215/master-issue2849-fix
...
Fix transactions do not get rollbacked in saveAssociated/saveMany.
Fixes #2849
2014-08-05 20:05:15 -04:00
chinpei215
1fe943d6f1
Fix afterFind() called twice with belongsTo and hasOne relationships
...
Refs #2268
2014-08-06 07:27:04 +09:00
euromark
9ef7b5713a
CS fixes.
2014-08-04 13:53:52 +02:00
chinpei215
cb376bf420
Add some more transaction tests
...
And remove 2 else clauses.
2014-08-03 22:34:11 +09:00
chinpei215
799500ce6d
Fix transactions do not get rollbacked in saveAssociated/saveMany
...
Refs #2849
2014-08-02 10:12:33 +09:00
chinpei215
3d77ce5d34
Fix serveral tests pass regardless of whether data is valid or not
2014-08-02 09:55:29 +09:00
chinpei215
f3e1a18740
Fix a fatal error occurs in combination with a scaffold error.
2014-07-31 05:49:23 +09:00
mark_story
f9785042bc
Fix indentation.
...
Refs #4108
2014-07-29 21:53:55 -04:00
Steve Tauber
e6f6ded334
Adding unit test for HTTP DELETE and RequestHandlerComponent::requestedWith
2014-07-29 16:34:11 +02:00
euromark
b188d670b7
Make year range validation less strict by default.
2014-07-26 04:06:26 +02:00
Mark Story
adf739b893
Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix
...
Make SMTP auth reply code checks work properly.
2014-07-24 08:42:22 -04:00
Rachman Chavik
aad89444d1
Fix: Blackholed request when POSTing to a URL with space
...
Eg:
Actual Posted URL:
/admin/settings/settings/prefix/Access%20Control
$_GET value:
/admin/settings/settings/prefix/Access_Control
Since $unsetUrl differs, the $_GET value will get copied in to
CakeRequest::$query, causing CakeRequest::here() to return:
/admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control=
This confuses SecurityComponent in the following line:
f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)
2014-07-24 16:25:03 +07:00
David Steinsland
6e777a54a3
Mocking _sendHeader instead of send()
2014-07-22 15:05:06 +02:00
David Steinsland
d98abc58d1
Added test case for CakeResponse::send() and ajaxLogin
2014-07-22 14:45:18 +02:00
mark_story
0dfce1abf3
Add .
to the list of allowed characters.
...
This was missed when the email validation rules were relaxed in
dc34d80f6f
.
Fixes #4027
2014-07-19 19:57:33 -04:00
ndm2
f03bf8067c
Add some more exception message checks
2014-07-18 14:56:10 +02:00
ndm2
bf7d01ac66
Make SMTP auth reply code checks work properly.
2014-07-18 14:53:22 +02:00
chinpei215
ca93bbcd15
Fix CS
2014-07-14 01:21:09 +09:00
chinpei215
ace30fdd8a
Fix a race condition problem
...
Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.
Refs #3857
2014-07-12 23:27:39 +09:00
mark_story
03c2a8b722
Unify datetime column default values between MySQL and Postgres.
...
Datetime columns should have 'default' => null, in both Postgres and
MySQL.
Fixes #3837
2014-07-11 23:10:16 -04:00
mark_story
a098d96c94
Remove flaky test that was of questionable value.
2014-07-10 14:39:20 -04:00
chinpei215
0c1fc36b14
Fix an infinite recursion caused by missing plugin
...
When a MissingPluginException has caught when rendering an exception,
we should disable the plugin as needed to prevent an infinite recursion.
2014-07-09 15:55:41 +09:00
Schlaefer
1e961a8aac
increases time window in CSRF token expiry tests to 2 seconds
...
travis-cs failed with 1 second margin
2014-07-06 13:54:24 +02:00
Schlaefer
9fa7afa354
fixes #3887 CSRF reusable token expires
2014-07-06 10:39:00 +02:00
José Lorenzo Rodríguez
396725dc8c
Merge pull request #3880 from markstory/incorrect-validation
...
Fix issues with Validation::inList() and SecurityComponent
2014-07-05 14:41:15 +02:00
ADmad
1eccec02e4
Merge pull request #3872 from CostaC/response-sharable-fix
...
Fix for CakeResponse::sharable() header to include private caches
2014-07-04 10:32:51 +05:30
mark_story
3936cce4b8
Disallow hexadecimal input with inList.
...
Instead of turning on/off strict mode based on the user supplied input,
cast everything to strings and always use a strict check. This avoids
the potential issue of a bad user using hexadecimal when they should not
be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.
2014-07-03 22:10:49 -04:00
Costa Caruso
4f559f5cc9
Fixed failing test for CakeResponse::sharable + spacing
2014-07-03 15:03:48 -04:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00