mark_story
2546b79c62
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-05-27 20:55:16 -04:00
mark_story
0c8406c034
Merge branch 'master' into 2.6
2014-05-27 20:55:06 -04:00
José Lorenzo Rodríguez
05d92ddc0a
Merge pull request #3560 from cakephp/2.6-memcached-options
...
2.6 memcached options
2014-05-26 21:47:45 +02:00
Mark Story
9c9d45596f
Merge pull request #3478 from Schlaefer/#3303-lengthBetween
...
closes #3303 RFC: Rename Validator::between() into Validator::length()
2014-05-24 16:48:05 -04:00
mark_story
86c7d1ff5e
Add addtional options array for memcached.
...
Memcached supports a number of options that we should afford in our
memcached adapter.
Fixes #3477
2014-05-23 22:29:03 -04:00
mark_story
db86b0c050
Don't disable the entire select when disabled is array(1)
...
When the disabled attribute is just array(1), then the attribute should
be filtered out of select element attributes. This is kind of a hacky
workaround but changing the underlying attribute handling is going to be
pretty tricky and far more dangerous.
Fixes #3546
2014-05-23 13:26:11 -04:00
mark_story
587f2da09e
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-05-22 14:29:43 -04:00
mark_story
cd68002246
Add additional test case for named parameters.
...
Refs #3525
2014-05-22 14:14:35 -04:00
akiyan
781430c4af
Removed unnecessary conditional branch, fixed test and comment.
2014-05-22 14:08:18 -04:00
akiyan
67f256297d
Fixed secure form hash for special url.
...
No htmlspecialchars encode and without fragment identifer.
2014-05-22 14:08:11 -04:00
mark_story
270e8774e4
Fix incorrect status line parsing in HttpSocketResponse.
...
Allow for multi-word status reasons.
Closes #3545
2014-05-21 21:53:18 -04:00
mark_story
2e4d6eb009
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-05-16 21:26:30 -04:00
euromark
143e8e4c56
Make sure invalid arrays return empty array instead of throwing notices.
2014-05-14 23:53:58 +02:00
mark_story
20ef10aca2
Fix inline attachments being broken when only sending an HTML text body.
...
The rel boundary was closed too early causing inline images to be
incorrectly included in the email message.
Refs #3474
2014-05-14 09:42:25 -04:00
Schlaefer
6b80ae35b1
fixes model task test-cases for 'between' validation rule alias
2014-05-14 10:55:24 +02:00
Schlaefer
bf0edd1112
fixes failing test cases in ModelTaskTest if not run in test-suite
...
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
2014-05-14 10:34:09 +02:00
mark_story
66e733f8b1
Fix test I forgot to fix in b8fa7ce134
2014-05-13 22:12:39 -04:00
mark_story
b8fa7ce134
Fix issues where emails would have multipart/mixed when they should not.
...
When sending multi-part emails with no attachments we shouldn't include
the outer multipart/mixed header as it confuses Outlook and causes it to
show the email as having attachments even though there are none.
A bunch of tests need to be adjusted as the empty multipart/mixed
container has been removed.
Fixes #3474
2014-05-13 22:03:06 -04:00
mark_story
e9ecfe0936
Remove x bit on files.
...
PHP files should not have executable permission set.
2014-05-13 12:30:14 -04:00
Schlaefer
3ac731273e
adds backwards compatible 'between' alias for 'lengthBetween' validation rule
2014-05-13 17:36:23 +02:00
Schlaefer
e10e8fcb15
fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X
...
thousand separator isn't set in de_DE but in da_DK
2014-05-13 13:25:53 +02:00
Schlaefer
021d765620
fixes falling test case for 'lengthBetween' validator
2014-05-13 10:46:50 +02:00
Schlaefer
815838f150
replaces validator 'between' with 'lengthBetween'
2014-05-13 10:46:25 +02:00
Schlaefer
4848b63189
closes #3303 RFC: Rename Validator::between() into Validator::length()
2014-05-13 09:31:03 +02:00
mark_story
a34d5f733d
Fix PaginatorComponent tests.
...
Because count() queries don't happen in many cases now, the lastQueries
index needs to shift up by one because a query isn't happening anymore.
Refs #3333
2014-05-12 22:10:27 -04:00
mark_story
89cd114e6f
Merge branch 'master' into 2.5
2014-05-12 14:30:02 -04:00
mark_story
d0b995ad79
Merge branch '2.5' into 2.6
2014-05-11 21:47:42 -04:00
José Lorenzo Rodríguez
751d2d8f2d
Merge pull request #3448 from dereuromark/master-controller
...
Controller::referer() and local URL
2014-05-07 22:42:28 +02:00
mark_story
5469840c80
Fix incorrectly generated URL path.
...
Refs #3442
2014-05-07 08:52:42 -04:00
mark_story
1103ca7816
Ensure that only the path and query are used to make the hash.
...
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.
Fixes #3442
2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7
Make test names match the rest of the tests.
2014-05-06 22:13:44 -04:00
Renan Gonçalves
87683b10f1
Allowing same Authenticate object to be setup with different settings.
2014-05-06 22:10:41 +02:00
ADmad
aa7f18840c
Merge branch '2.5' into 2.6
2014-05-04 14:40:39 +05:30
ADmad
d466e00644
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
lib/Cake/Utility/Folder.php
lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
fecf321cce
This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it.
2014-05-02 13:33:57 +02:00
mark_story
e1057e3e6b
Fix FormHelper::postLink() not working when SecurityComponent is enabled.
...
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.
Fixes #3418
2014-04-29 11:23:52 -04:00
euromark
7a287a6942
More coding standard corrections.
2014-04-29 14:19:33 +02:00
mark_story
1d1a2f859c
Fix coding standards error.
2014-04-28 20:56:06 -04:00
euromark
06aa747b21
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite
2014-04-29 02:35:20 +02:00
euromark
5e5a776de8
Backporting overwrite() from 3.0 to 2.6.
2014-04-29 02:18:27 +02:00
euromark
8679c5cd18
Fix test
2014-04-28 17:33:56 +02:00
mark_story
cf96e9f54f
Merge branch 'master' into 2.5
2014-04-26 22:04:19 -04:00
mark_story
a28158d614
Add additional test for f23d811ff5
...
I neglected to put a negative test to ensure validatePost fails when the
URL differs.
2014-04-26 10:23:27 -04:00
Mark Story
5b46eb71ec
Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock
...
fixed FormHelper to allow create() on Mock Models without errors
2014-04-26 08:53:43 -04:00
ADmad
68572d8046
Cannot use php 5.4+ array syntax for 2.x.
2014-04-26 17:30:31 +05:30
Jorge González
5cf2ce723c
fixed FormHelper to allow create() on Mock Models without errors
2014-04-26 10:33:58 +01:00
mark_story
de0062de77
Merge branch 'master' into 2.5
2014-04-25 22:10:02 -04:00
mark_story
f23d811ff5
Use the form action URL in generated form hashes.
...
By including the URL in generated hash for secured forms we prevent
a class of abuse where a user uses one secured form to post into a
controller action the form was not originally intended for. These cross
action requests could potentially violate developer's mental model of
how SecurityComponent works and produce unexpected/undesirable outcomes.
Thanks to Kurita Takashi for pointing this issue out, and suggesting
a fix.
2014-04-25 22:05:58 -04:00
ADmad
27699d1f12
Fix auto linking urls with subdomain with underscore.
...
Closes #3392
2014-04-25 22:28:34 +05:30
Stefan Dickmann
f90f718e11
change parameter order
2014-04-24 12:54:45 +02:00