Commit graph

18638 commits

Author SHA1 Message Date
Mark Story
a73a707231 Merge pull request #9165 from mvdriel/prevent-unnecessary-joins-complex-conditions-in-delete
Prevent unnecessary joins / complex conditions in delete
2016-07-26 09:22:27 -04:00
Mark van Driel
c01525f2cc Make check more strict to respect existing queries 2016-07-26 11:25:27 +02:00
Mark van Driel
d6e45131ad Prevent unnecessary joins / complex conditions in delete 2016-07-25 17:15:18 +02:00
Mark Story
b50c06423d Merge pull request #9115 from biesbjerg/ticket-7488
Fire Controller.shutdown and Dispatcher.afterDispatch events when exceptions are thrown
2016-07-19 22:49:02 -04:00
Mark Story
ade7ff7051 Merge pull request #9138 from ravage84/patch-5
Add fix for the httpoxy vulnerability
2016-07-19 13:11:02 -04:00
Marc Würth
46e8fd1eb7 Add fix for the httpoxy vulnerability
Refs https://github.com/cakephp/cakephp/issues/9137#issuecomment-233637635
2016-07-19 16:23:27 +02:00
Mark Story
876b508797 Merge pull request #9108 from cakephp/issue-9106
Don't split strings headers that lack a ':'.
2016-07-15 22:20:13 -04:00
Kim Biesbjerg
cbdc89ddee Fix CS error 2016-07-14 05:50:37 +02:00
Kim Biesbjerg
38cad279d1 Updated test method name and description 2016-07-14 04:57:25 +02:00
Kim Biesbjerg
c77b628841 Dispatch Controller.shutdown instead of calling afterFilter directly. Updated test 2016-07-14 04:51:49 +02:00
Kim Biesbjerg
a05639a30e Don't save buffered output to var since it is not used 2016-07-14 00:20:33 +02:00
Kim Biesbjerg
5a63ee4e3e Added tests to prove that Dispatcher.afterDispatch event is dispatched by exception renderer on error response 2016-07-14 00:17:02 +02:00
Kim Biesbjerg
bddff7d2b0 Dispatch afterDispatch event when exception is thrown 2016-07-13 23:40:27 +02:00
mark_story
4e1b601ed8 Don't split strings headers that lack a ':'.
Refs #9106
2016-07-12 22:46:47 -04:00
Mark Story
7763e5d6bc Merge pull request #9086 from psaintjust/association-plugin-classname
Association plugin classname
2016-07-10 10:18:32 -04:00
Philippe Saint-Just
be7cecbb00 Removed whitespace 2016-07-10 14:02:55 +01:00
Philippe Saint-Just
b0e5e39e45 Added test case 2016-07-10 09:57:24 +01:00
Philippe Saint-Just
7edcdb0799 Handle plugin association consistently 2016-07-09 16:08:16 +01:00
Philippe Saint-Just
ae42debeff Merge remote-tracking branch 'cakephp/2.x' into 2.x 2016-07-09 16:03:15 +01:00
Mark Story
0a0ded16ad Merge pull request #9072 from biesbjerg/ticket-9070
Store user data in memory on login for stateless auth adapters
2016-07-07 22:40:05 -04:00
Kim Biesbjerg
1d7a4da903 Fixed wrong assertion 2016-07-07 09:24:33 +02:00
Kim Biesbjerg
0ea315b2e0 Add assertion to prove session is not started on stateless login 2016-07-07 08:58:51 +02:00
Kim Biesbjerg
c63de8d9f5 Added test to prove stateless login sets user 2016-07-06 12:34:23 +02:00
Kim Biesbjerg
f22129b9c7 Store user data in memory on login for stateless auth adapters 2016-07-06 00:25:46 +02:00
Mark Story
6bccfe9f40 Merge pull request #9063 from cakephp/issue-8968
Add test showing that niceShort translates month names.
2016-07-01 22:18:50 -04:00
mark_story
234f732d6d Attempt to get tests passing on travis.
Also attempt to get stickler to ignore the 2.x branch.
2016-07-01 17:52:02 -04:00
mark_story
d816ea6e16 Add test showing that niceShort translates month names.
Refs #8968
2016-07-01 17:51:23 -04:00
Mark Story
b57009cbb9 Merge pull request #9067 from cakephp/2.x-stickler
Make stickler ignore 2.x and 2.next branches.
2016-07-01 17:19:26 -04:00
José Lorenzo Rodríguez
b5387b2f07 Merge pull request #9065 from alex2690/issue9064
fixes #9064 - added new locale for Icelandic language
2016-07-01 22:34:02 +02:00
ADmad
e6a3bdf954 Make stickler ignore 2.x and 2.next branches. 2016-07-01 17:28:50 +05:30
Alex Para
58a31ecfe5 fixes #9064 2016-07-01 14:46:27 +03:00
Alex Para
3a42ecc61c fixes #9064 - added new locale for Icelandic language 2016-07-01 11:11:16 +03:00
mark_story
7626896286 Merge branch '2.x' of github.com:cakephp/cakephp into 2.x 2016-06-28 22:07:44 -04:00
mark_story
a366ac1f66 Merge branch 'issue8654' into 2.x
Removes empty string elements from the secured field list, as in 3.x
2016-06-28 22:07:07 -04:00
mark_story
7c2d6ae197 Combine code paths.
At the end of both if/else arms we should have an array that can be
pushed through Hash::filter().

Refs #8654
2016-06-28 22:06:53 -04:00
nojimage
57e0a97483 refs #8654 FormHelper cleanup unlockFields key 2016-06-28 22:01:06 -04:00
Mark Story
0e97116093 Merge pull request #9042 from gestudio/patch-1
Issue #9040 - Auth saving json in Auth.redirect
2016-06-27 21:48:56 -04:00
mark_story
f28c21c7a7 Stop testing against SSL ciphers that emit warnings.
Testing that SSLv3 still works is causing test failures.
2016-06-27 21:47:37 -04:00
Iñigo In The Cloud
2c112095a9 Issue #9040 - Auth saving json in Auth.redirect
AuthComponent is storing JSON or any other AJAX request URL into the session variable Auth.redirect used for login redirect if the AJAX request does not send the X-Requested-With:XMLHttpRequest header.

If you send an ajax request without that header and your request is not a (.json) it will store the URL anyway.
2016-06-27 14:15:05 -04:00
mark_story
92a50d05dc Reset query timing metrics for begin/commit/insert multi calls.
Apply patch from @Mensler to reset the query metrics for transaction
operations, and for each iteration of an insertMulti call. This helps
provide more accurate query times.

Refs #9014
2016-06-22 22:20:00 -04:00
Mark Story
7735a6182f Merge pull request #8994 from chinpei215/2.8-home-errormsg
Fix misnamed variable in default home.ctp
2016-06-16 00:11:45 -04:00
chinpei215
0bf38c1ee4 Fix misnamed variable in default home.ctp
PDO error message wouldn't appear when using PHP 5.4 or later.
2016-06-16 12:12:37 +09:00
Mark Story
9cc515bf9e Merge pull request #8982 from kolorafa/patch-1
Can't override CakeEmail class and use deliver
2016-06-13 21:17:22 -04:00
kolorafa
449e5fc9cf Can't override CakeEmail class and use deliver
When using TemplateEmail::deliver it always create new instance of CakeEmail, I assume it should create my extended "TemplateEmail" class insted.

PHP >5.3 compatible
2016-06-13 18:02:26 +02:00
mark_story
d352b5f14d Correct domain name used to upload pear packages. 2016-06-12 22:17:04 -04:00
mark_story
64e7c8d991 Update version number to 2.8.5 2016-06-12 22:15:08 -04:00
José Lorenzo Rodríguez
571b33e1f2 Merge pull request #8930 from cakephp/issue-8929
Add missing uses() call.
2016-06-03 08:16:27 +02:00
mark_story
7055e82eab Add missing uses() call.
Refs #8929
2016-06-02 22:04:50 -04:00
mark_story
c2bc45ac42 Remove old logo from README. 2016-05-29 16:29:05 +02:00
Mark Story
55e9638044 Merge pull request #8844 from icyrizard/add_http_patch_content_type_check
Add HTTP patch Content-Type check
2016-05-27 15:41:18 +02:00