Commit graph

18926 commits

Author SHA1 Message Date
chinpei215
1fe943d6f1 Fix afterFind() called twice with belongsTo and hasOne relationships
Refs #2268
2014-08-06 07:27:04 +09:00
ADmad
fa2cba6dff Merge pull request #4169 from thinkingmedia/patch-1
Added missing return statement.
2014-08-05 18:26:12 +05:30
Mathew Foscarini
4957418a4b Added missing return statement.
PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.
2014-08-05 08:39:19 -04:00
euromark
e714341ce3 Auto-detect composer installed CakePHP folder. 2014-08-05 03:53:40 +02:00
Mark Story
b608bdfadb Merge pull request #4164 from dereuromark/2.6-deprecate-ssn-validation
Deprecate ssn() validation in favor of plugin Localized.
2014-08-04 19:09:05 -04:00
euromark
816e64bec8 Adjust wording. 2014-08-04 16:46:56 +02:00
euromark
bbcdf2404e Deprecate ssn() validation in favor of plugin Localized. 2014-08-04 16:39:43 +02:00
Mark Story
214d278119 Merge pull request #4161 from dereuromark/master-cs-equals
CS fixes.
2014-08-04 10:06:41 -04:00
euromark
9ef7b5713a CS fixes. 2014-08-04 13:53:52 +02:00
euromark
864f5e06f6 Fix notice in CakeSession. 2014-08-04 13:32:20 +02:00
mark_story
4e168ca004 Fix incorrect docs. 2014-08-03 20:36:31 -04:00
chinpei215
cb376bf420 Add some more transaction tests
And remove 2 else clauses.
2014-08-03 22:34:11 +09:00
Mark Story
2359e89c78 Merge pull request #4150 from ADmad/2.5-cachehelper-exception
Throw exception instead of logging in debug mode when view cache fails.
2014-08-02 18:45:48 -04:00
ADmad
c193ce708a Throw exception instead of logging in debug mode. 2014-08-03 03:16:39 +05:30
ADmad
713f430fc4 Merge branch 'master' into 2.6 2014-08-03 01:05:36 +05:30
chinpei215
799500ce6d Fix transactions do not get rollbacked in saveAssociated/saveMany
Refs #2849
2014-08-02 10:12:33 +09:00
chinpei215
3d77ce5d34 Fix serveral tests pass regardless of whether data is valid or not 2014-08-02 09:55:29 +09:00
ADmad
8e40fcf5ef Merge pull request #4131 from williamn/master
Update HtmlHelper.php
2014-08-01 10:39:47 +05:30
William Notowidagdo
23954e6ad3 Update HtmlHelper.php
No need to add `null` to `$options` param as mentioned in the docs section: [Using blocks for script and CSS files](http://book.cakephp.org/2.0/en/views.html#using-blocks-for-script-and-css-files)
2014-08-01 11:22:29 +07:00
Mark Story
a6caf28ea6 Merge pull request #4122 from chinpei215/master-scaffold-error-fix
Fix a fatal error occurs in combination with a scaffold error.
2014-07-31 10:44:33 -04:00
ADmad
896065d718 Merge pull request #4117 from antograssiot/master
master - `a` / `an` typo fixes for API
2014-07-31 09:31:14 +05:30
chinpei215
f3e1a18740 Fix a fatal error occurs in combination with a scaffold error. 2014-07-31 05:49:23 +09:00
Anthony GRASSIOT
aa42b80a4d a / an typo fixes fot API 2014-07-30 22:11:03 +02:00
mark_story
4bee5b4b86 Fix RequestHandlerComponent not unserializing JSON on DELETE requests.
Fixes #4108
2014-07-29 21:54:03 -04:00
mark_story
f9785042bc Fix indentation.
Refs #4108
2014-07-29 21:53:55 -04:00
Steve Tauber
e6f6ded334 Adding unit test for HTTP DELETE and RequestHandlerComponent::requestedWith 2014-07-29 16:34:11 +02:00
Steve Tauber
0af698c591 Updating RequestHandlerComponent to accept body of HTTP Delete requests 2014-07-29 16:08:33 +02:00
José Lorenzo Rodríguez
ec28108325 Merge pull request #4087 from dereuromark/master-validation-year
Make year range validation less strict by default.
2014-07-29 10:23:48 +02:00
José Lorenzo Rodríguez
8b1a65f8b9 Merge pull request #4106 from cakephp/header-exception
Raise exceptions when headers have been sent
2014-07-29 10:23:29 +02:00
mark_story
0b85c35635 Fix up code formatting and structure for #3998
* Fix the various PHPCS errors.
* Make the logic less complex.
2014-07-28 21:47:35 -04:00
Xinquan Zhu
e08b8148a5 throw CakeException instead, putting throws tag in the comment 2014-07-28 21:41:51 -04:00
Xinquan Zhu
809de69dcf replace whitespaces with TABs and only throw exception when Cake is in Debug mode 2014-07-28 21:41:51 -04:00
Xinquan Zhu
792c251890 throw an Exception when header is already been sent 2014-07-28 21:41:51 -04:00
mark_story
3c1d3ee461 Deprecate CacheHelper.
It has been removed from 3.0 as it was a bad idea, and better solutions
have been created outside of PHP.
2014-07-27 22:20:47 -04:00
ADmad
4e52941f59 Fix CS errors. 2014-07-27 12:54:15 +05:30
ADmad
9e21d048ce Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-07-27 12:29:39 +05:30
euromark
b188d670b7 Make year range validation less strict by default. 2014-07-26 04:06:26 +02:00
Mark Story
d6733e3ad1 Merge pull request #4078 from dereuromark/master-bake
Fix project baking
2014-07-24 13:13:08 -04:00
euromark
99d6932ecc Fix project baking 2014-07-24 18:43:48 +02:00
Mark Story
adf739b893 Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix
Make SMTP auth reply code checks work properly.
2014-07-24 08:42:22 -04:00
José Lorenzo Rodríguez
94b9bf807b Merge pull request #4076 from rchavik/2.5-space-in-url
Fix: Blackholed request when POSTing to a URL with space
2014-07-24 12:53:04 +02:00
Rachman Chavik
aad89444d1 Fix: Blackholed request when POSTing to a URL with space
Eg:

Actual Posted URL:
    /admin/settings/settings/prefix/Access%20Control
$_GET value:
    /admin/settings/settings/prefix/Access_Control

Since $unsetUrl differs, the $_GET value will get copied in to
CakeRequest::$query, causing CakeRequest::here() to return:

    /admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control=

This confuses SecurityComponent in the following line:

    f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)
2014-07-24 16:25:03 +07:00
Mark Story
d0a22ade39 Merge pull request #4044 from ravage84/patch-1
Added NetBeans project folder to .gitignore
2014-07-23 21:37:58 -04:00
mark_story
08de917b3c Fix accidental typo in SQL file.
Fixes #4061
2014-07-22 09:38:46 -04:00
ADmad
80ba96cef6 Merge pull request #4060 from davidsteinsland/fix_ajax_login_header
Fixed sending of headers when ajaxLogin is set
2014-07-22 19:01:51 +05:30
David Steinsland
6e777a54a3 Mocking _sendHeader instead of send() 2014-07-22 15:05:06 +02:00
David Steinsland
d98abc58d1 Added test case for CakeResponse::send() and ajaxLogin 2014-07-22 14:45:18 +02:00
David Steinsland
b61972871a Fixed sending of headers when ajaxLogin is set 2014-07-22 13:21:42 +02:00
mark_story
7a14ed7490 Merge branch '2.6-remove-subcommand' into 2.6
Merge changes from cakephp/cakephp#4039 into 2.6. This will effectively
backports the changes to 2.6, and allows them to be merged into 3.0 at
the same time.

Closes #4039
2014-07-21 23:56:26 -04:00
Denys Kyselov
1434e79330 Typo fix 2014-07-21 23:55:49 -04:00