Commit graph

16958 commits

Author SHA1 Message Date
Haithem Ben Ghorbal
35c2a7ef31 restore previous (erroneous ?) behaviour 2014-05-29 02:36:13 +02:00
Haithem Ben Ghorbal
67af8b37db clean code and remove unneeded checks 2014-05-28 23:53:47 +02:00
Haithem BEN GHORBAL
d4a0883cb9 fix typo/coding style 2014-05-28 18:31:03 +02:00
Haithem BEN GHORBAL
a8e410ee20 fix save with habtm returning false 2014-05-28 18:17:16 +02:00
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
mark_story
edcbf4e92f Manually port f287bc76c0 to 2.6
Git won't let me merge the changes as I have 'unstaged changes'.
2014-05-27 20:54:36 -04:00
Mark Story
f287bc76c0 Force .bat files to have CRLF endings.
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.

Hopefully this fixes the issue.

Fixes #3585
2014-05-27 19:06:08 -04:00
Mark Story
e5de1df165 Merge pull request #3577 from tersmitten/consistent-use-of-err-for-errors
Consistent use of `Shell::err` for errors
2014-05-27 09:18:32 -04:00
Mischa ter Smitten
329fd3fe4c Consistent use of Shell::err for errors 2014-05-27 12:29:09 +02: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
a0851702ff Fail the build as soon as one build fails.
No need to run all the builds when one of them has already failed.
2014-05-23 14:05:09 -04:00
mark_story
ec3222ca64 Allow the PHPCS to fail. 2014-05-23 14:02:20 -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
81875cfeb1 Optimize renew().
Don't call session_id() twice when we can use a local variable to store
the current session id.

Fixes #3531
2014-05-22 14:28:56 -04:00
mark_story
c6d02d5779 Merge branch 'secure-form-url-special'
Merge pull request #3525 into master. This fixes additional issues with
form tampering prevention by accomodating more URL types.
2014-05-22 14:14:46 -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
b1fe9134c6 Merge pull request #3528 from Marlinc/patch-1
Add 'feedback' to uninflected single and plurals
2014-05-19 16:46:16 -04:00
José Lorenzo Rodríguez
1d34793828 Merge pull request #3530 from beporter/feature/bin-cake-cdpath-fix
Harden the `cake` script to avoid `CDPATH` breakage.
2014-05-19 21:44:29 +02:00
Marlin Cremers
1977d51a49 Add 'feedback' to uninflected single and plurals 2014-05-19 20:57:11 +02:00
Brian Porter
9452d5e1b6 Harden the bin/cake script to avoid breakage when local shell environment has a CDPATH set. 2014-05-19 11:05:28 -05:00
mark_story
0fd12c7a68 Update version number to 2.5.1 2014-05-17 22:39:27 -04:00
mark_story
2e4d6eb009 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-05-16 21:26:30 -04:00
mark_story
153141a6c7 Make help clearer around how to use UpgradeShell.
Closes #3504
2014-05-15 11:32:32 -04:00
Mark Story
6ace6c3fd8 Merge pull request #3498 from dereuromark/master-hotfix-hash
Make sure invalid arrays return empty array instead of throwing notices.
2014-05-14 20:50:16 -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
ef96724bc8 Merge pull request #3497 from jameswatts/feature/view-wat
Removed the little doc that lied
2014-05-14 14:42:56 -04:00
James Watts
992ab5ea11 Removed the little doc that lied
View::get() never looked up blocks
2014-05-14 20:06:37 +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
José Lorenzo Rodríguez
5ab02a0ed1 Merge pull request #3493 from Schlaefer/fix-failingModelTaskTest
fixes failing test cases in ModelTaskTest if not run in test-suite
2014-05-14 11:47:28 +02:00
Schlaefer
6b80ae35b1 fixes model task test-cases for 'between' validation rule alias 2014-05-14 10:55:24 +02:00
José Lorenzo Rodríguez
73f725e7ff Merge pull request #3489 from rchavik/2.5-composer
Updated the test suite dispatcher to allow use of PHPUnit from Composer
2014-05-14 10:34:21 +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
David Yell
140e0bbbd3 Updated the test suite dispatcher to allow use of PHPUnit from Composer
Closes #3479
2014-05-14 09:09:53 +07: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
2d46be6de5 Merge pull request #3471 from coencoppens/issue-2122
Issue 2122
2014-05-13 22:56:12 +02:00
Mark Story
2259309580 Merge pull request #3484 from dereuromark/master-hotfix-bake
Hotfix for older baked templates regarding postLink()
2014-05-13 16:53:06 -04:00
euromark
8af76a3705 Hotfix for older baked templates regarding postLink() 2014-05-13 20:51:39 +02:00
Mark Story
418c0a7b7c Merge pull request #3481 from okinaka/master
Unset $db in DboSource::read().
2014-05-13 14:01:33 -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
Mark Story
33ebfa65cc Merge pull request #3483 from dereuromark/master-hotfix-bake
Fixes baked postLink()s
2014-05-13 12:16:42 -04:00
Schlaefer
3ac731273e adds backwards compatible 'between' alias for 'lengthBetween' validation rule 2014-05-13 17:36:23 +02:00
euromark
aefc459907 Fixes baked postLink()s 2014-05-13 17:14:11 +02:00