Mark S.
c87de2a069
Fix CS
2015-09-17 11:33:59 +02:00
mark
e7d6319d59
Skip test for versions of < MySQL5.6.
2015-09-17 10:43:43 +02:00
mark
d8a55ad065
Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.
2015-09-16 14:16:58 +02:00
Mark Story
4a316b158e
Merge pull request #7387 from cakephp/2.7-fixture
...
Backport 3.x limit of fixture data generation.
2015-09-13 16:14:05 -04:00
Mark Scherer
450a544eb4
Backport 3.x limit of fixture data generation.
2015-09-13 13:12:53 +02:00
mark_story
e8ce841ffb
Merge branch '2.7-sander' into 2.7
...
Refs #7384
2015-09-12 15:28:41 -04:00
Sander Visser
5a7507df4f
Fix issue "Debugger class not found"
...
App::uses('Debugger') not needed because it's allready defined in top of file
2015-09-12 15:28:30 -04:00
José Lorenzo Rodríguez
a4a63bfabd
Merge pull request #7379 from cakephp/issue-7365
...
Set the `key` variable in the SessionHelper.
2015-09-11 09:55:50 +02:00
mark_story
9eafde13d2
Set the key variable in the SessionHelper.
...
This fixes cross template compatibility between the Flash and Session
helpers.
Refs #7365
2015-09-09 22:08:49 -04: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
0dbabce792
Update version number to 2.7.3
2015-08-23 22:22:27 -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
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
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
paolo
a7b5f8c3af
DboSource now check the actual status of connection by executing a dumb query on DB
...
This change makes it possible for developer to build reconnection logic
on MySQL connections which frequently time out in long running CLI
processes.
Cherry picked onto 2.7 from #7190 .
2015-08-07 21:59:28 -04:00
mark_story
f959b76013
Update version number to 2.7.2
2015-08-06 21:43:53 -04:00
mark_story
07c2047984
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
2015-08-06 21:43:40 -04:00
mark_story
b7c9ac913d
Backport fixes for comparison() and range() to 2.x
...
These fixes were released as a security update for 3.x, they also belong
in 2.x
2015-08-06 21:36:39 -04:00
José Lorenzo Rodríguez
2fe2f6eb5a
Merge pull request #7179 from cakephp/issue-7176
...
Fix fatal error on null subject.
2015-08-06 09:35:58 +02:00
mark_story
056f24a774
Forbid direct prefix access with mixed casing.
...
Changing the casing up should not allow prefix method access.
2015-08-05 23:05:30 -04:00
mark_story
9f20330d17
Fix fatal error on null subject.
...
Refs #7176
2015-08-05 22:20:39 -04:00
Mark Story
01b6374a9d
Merge pull request #7175 from cakephp/2.7-hotfix
...
fix templates
2015-08-05 08:22:05 -04:00
Mark Scherer
3f15c8a199
fix templates
2015-08-05 11:45:27 +02:00
Mark Story
58bede76d1
Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
...
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
José Lorenzo Rodríguez
b89ac18e55
Merge pull request #7147 from cakephp/issue-7118
...
Fix incorrectly parsed mo file context.
2015-08-02 11:30:46 +02:00
Mark Story
b6cd2009e5
Merge pull request #7156 from ravage84/2.7-htaccess
...
Use tabs and single spaces in all .htaccess files
2015-07-31 20:37:26 -04:00
Marc Würth
27c88a872b
Use tabs and single spaces in all .htaccess files
2015-08-01 00:39:10 +02:00
mark_story
a73fc25657
Fix incorrectly parsed mo file context.
...
The context from mo files should be parsed correctly.
Refs #7118
2015-07-30 22:28:55 -04:00
José Lorenzo Rodríguez
eddb2beb46
Merge pull request #7141 from cakephp/issue-7135
...
Bootstrap Configure after the mb_* shims have been defined.
2015-07-30 10:20:24 +02:00
