Commit graph

19502 commits

Author SHA1 Message Date
thomasv
1dbb6dd0e4 Update DatabaseSession.php
To prevent error: "Integrity constraint violation: 1052 Column 'id' in where clause is ambiguous" when using a custom Session object in relationship with another object (belongsTo <-| hasMany)
2015-09-10 00:25:39 +02:00
José Lorenzo Rodríguez
2d2c5be543 Merge pull request #7357 from cakephp/issue-7076
Always update updated/modified columns when a fieldList is used.
2015-09-07 22:27:02 +02:00
mark_story
e4cce7a441 Fix errors in PHP <5.4 2015-09-06 22:14:04 -04:00
mark_story
60d7bbaa10 Always update updated/modified columns when a fieldList is used.
When a fieldList is used, and updated is not in the fieldList, the
column should continue to be updated even if the column has a value from
the user. Because the field is not in the fieldList, we must assume that
the intent is for the field to update automatically, as it would have if
the updated column was not present in the save data.

Refs #7076
2015-09-05 22:01:33 -04:00
mark_story
6722a8d8ea Merge branch '2.7' into 2.8 2015-09-02 22:18:10 -04:00
mark_story
77f2c8cb42 Use mb_strtolower in case-insensitive sorting.
We should try to support unicode everywhere people might use it.
2015-08-25 21:49:10 -04:00
mark_story
9b910dff31 Merge branch '2.8-hash-sort-ignore-case' into 2.8
Refs #7217
2015-08-25 21:46:08 -04:00
mark_story
a9ef1f8aea Simplify branching and add default options.
Use fewer conditionals by merging defaults and avoid exceptions
by setting defaults as well.

Refs #7217
2015-08-25 21:39:02 -04:00
Mark Story
ec48019d8e Merge pull request #7296 from cakephp/2.8-cleanup
Fix merge to + operator.
2015-08-24 12:15:23 -04:00
Mark Scherer
3cfc46db38 Fix merge to + operator. 2015-08-24 06:33:04 +02:00
mark_story
0dbabce792 Update version number to 2.7.3 2015-08-23 22:22:27 -04:00
mark_story
51d8f74c50 Merge branch '2.7' into 2.8 2015-08-23 16:29:07 -04:00
José Lorenzo Rodríguez
c2d94e8699 Merge pull request #7289 from cakephp/issue-7274
Handle case where a visible input shares a name with an invisible one.
2015-08-23 21:01:33 +02:00
mark_story
143c34bdc1 Handle case where a visible input shares a name with an invisible one.
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.

Refs #7274
2015-08-22 23:10:44 -04:00
Mark Story
a44d17dbfa Merge pull request #7277 from cakephp/2.7-mediaview
Fix MediaView extension handling as documented and expected.
2015-08-21 12:40:21 -04:00
Mark Scherer
f154a8f4d7 Fix MediaView extension handling as documented and expected. 2015-08-21 12:35:49 +02:00
Jose Lorenzo Rodriguez
d11656ad03 Merge branch 'rchavik-2.7-tz-abbr' into 2.8 2015-08-21 10:57:16 +02:00
Jose Lorenzo Rodriguez
3c7f022fa8 Merge branch '2.7-tz-abbr' of https://github.com/rchavik/cakephp into rchavik-2.7-tz-abbr 2015-08-21 10:56:48 +02:00
Jose Lorenzo Rodriguez
40d628530a Merge branch '2.7' into 2.8 2015-08-21 10:54:30 +02:00
Rachman Chavik
e6acacac03 CakeTime::listTimezones(): Add option to Display timezone abbreviations
Useful for countries that do not have many of its cities, even major ones,
listed. For eg: Indonesia, only have 4 cities listed.

For backward compatibility, abbreviations will not be shown.

Note: You might need to update timezonedb for PHP 5.3

Closes #7271
2015-08-21 10:54:33 +07:00
mark_story
0df0f1a559 Don't use short tags.
They are not broadly supported before PHP 5.4 and we should escape all
the content the core templates output.
2015-08-20 22:36:09 -04:00
Mark Story
d05727b6df Merge pull request #7265 from mattmemmesheimer/issue-7048
Issue 7048
2015-08-20 22:32:39 -04:00
mattmemmesheimer
70feb52f73 Changing the default layout to use FlashComponent::render instead of the deprecated SessionComponent::flash. Changing the flash elements to retain the id attribute that was previously present. Also fixing file permissions on the template files I added. 2015-08-20 20:19:22 -05:00
mattmemmesheimer
7d5e6e3a3e Reverting accidental chmod. 2015-08-19 17:50:47 -05:00
Mark Story
3532619515 Merge pull request #7260 from ndm2/2.7-fix-path-traversal-protection-for-win-os
Fix path traversal check for Windows based systems
2015-08-19 14:50:52 -04:00
ndm2
8fe953548c Fix path traversal check for Windows based systems
On Windows based systems, both, backward as well as forward
slashes are supported as path separators, thus checking for `DS`
only, would allow to slip in `../` fragments.

refs #5905, cad57dcc28
2015-08-19 16:47:53 +02:00
mattmemmesheimer
d4467f9acf Fixing unit tests. 2015-08-18 22:14:10 -05:00
Mark Story
daa795dfd3 Merge pull request #7242 from tanuck/2.7-no-table-validation-fail
2.7 fix PDO exception from Model::exists when useTable is false - #7229
2015-08-18 22:30:15 -04:00
James Tancock
5b92c900e6 Missing test fix ModelIntegration 2015-08-18 13:32:16 +01:00
James Tancock
fdb41e01bb Alter Model::exists() to return false with no table 2015-08-18 13:07:30 +01:00
James Tancock
2f7cc052d2 Typo in tests docblock 2015-08-17 13:15:35 +01:00
James Tancock
fd198ce0fa Edits to tests to cover the changes to Model::exists 2015-08-17 12:19:02 +01:00
mattmemmesheimer
d3cf879195 Updating deprecated SessionComponent::setFlash calls to FlashComponent magic calls. 2015-08-16 18:01:23 -05:00
mattmemmesheimer
604cb0e48b Including the FlashComponent by default in the controller when baking. 2015-08-16 17:58:41 -05:00
mattmemmesheimer
0df7bcd26d Adding Flash element template files. 2015-08-16 17:55:03 -05:00
James Tancock
90a77f6ce5 Alter model exists to consider useTable 2015-08-16 19:06:12 +01:00
Adrian Gunawan
12e5719aad Remove whitespace at end of line 2015-08-14 17:05:59 +10:00
Adrian Gunawan
80f6a97d93 Check === 'natural' was inadvertently removed 2015-08-14 15:32:23 +10:00
Adrian Gunawan
2eafcc0f72 Use array() instead of the short notation [] 2015-08-14 14:55:44 +10:00
Adrian Gunawan
bf6574c3b2 Use array() instead of the short notation [] 2015-08-14 14:26:01 +10:00
Adrian Gunawan
b89d8d5efa Use array() instead of the short notation [] 2015-08-14 14:15:00 +10:00
Adrian Gunawan
f23e6589d0 Overload $type parameter instead of adding another parameter for case insensitive sort 2015-08-13 11:16:32 +10:00
Adrian Gunawan
a217556c13 Ability for Hash::sort to sort case-insensitively 2015-08-12 14:35:11 +10:00
Mark Story
979820b884 Merge pull request #7214 from ravage84/2.7-caktetext-coverage
CakeTextTest Annotate test coverage
2015-08-11 12:12:09 -04:00
Marc Würth
f3e590acfb Annotate test coverage 2015-08-11 16:36:09 +02:00
Mark Story
6fae3f6bd0 Merge pull request #7207 from ravage84/2.8-testadd
Correct title of testAdd methods
2015-08-10 14:08:38 -04:00
Marc Würth
4330335940 Correct title of testAdd methods 2015-08-10 12:06:19 +02:00
mark_story
67585d6fe1 Data must be serialized before being written
Data is unserialized by redis engine on read, so we have to serialized
on write.
2015-08-09 16:00:44 -04:00
mark_story
d6251eff19 Fix parameter order. 2015-08-09 15:54:09 -04:00
mark_story
a5ff7ecaa3 Merge branch 'memcached-add-method' into 2.8
Refs #7165
2015-08-09 15:29:33 -04:00