Commit graph

19648 commits

Author SHA1 Message Date
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
Denys Kyselov
79dc624062 Add removeSubcommand in ConsoleOptionParser 2014-07-21 23:55:42 -04:00
mark_story
9b8e6403fd Add indexes to db_acl.sql in skel directory.
Copy changes in app/Config/Schema into the skel directory.

Refs #4052
2014-07-21 21:31:05 -04:00
mark_story
b129ce512e Update db_acl.sql to use correct column names.
The column names added in bb15271 were incorrect.

Fixes #4052
2014-07-21 21:30:05 -04:00
Marlin Cremers
fbeb8fe26b Add the other translation shortcuts for context support 2014-07-21 15:47:04 +02:00
ADmad
183c1e1276 Merge pull request #4047 from ceeram/2.6-cs
Fix cs error introduced after master to 2.6 merge.
2014-07-21 18:05:26 +05:30
Ceeram
02b8bce641 Fix cs error introduced after resolving merge conflict with master to 2.6 2014-07-21 14:01:43 +02:00
Marc Würth
cec7d5d03a Added NetBeans project folder to .gitignore
Refs 78fb9b559a (commitcomment-7077015)
2014-07-21 10:08:43 +02:00
mark_story
ac9af7e326 Update version number to 2.5.3 2014-07-20 22:20:47 -04:00
mark_story
0d14bf7cc8 Update doc blocks.
There were a few trailing comments in #3706 that have now been
addressed.
2014-07-20 22:00:07 -04:00
Mark Story
7ef7ce2dbb Merge pull request #3706 from MelvinRoss/httpsocketheader
Add support for specifying protocol in Cakesocket/HttpSocket.  Add HEAD function to HttpSocket
2014-07-20 21:58:37 -04:00
mark_story
0dfce1abf3 Add . to the list of allowed characters.
This was missed when the email validation rules were relaxed in
dc34d80f6f.

Fixes #4027
2014-07-19 19:57:33 -04:00
mark_story
0aabc5d910 Merge branch 'master' into 2.6 2014-07-18 21:50:05 -04:00
Mark Story
dbe7329e54 Merge pull request #3703 from MMS-Projects/i18n-context-2.6
Basic support for I18n contexts as requested by #2063
2014-07-18 21:48:19 -04:00
Mark Story
52c8aa1b54 Merge pull request #4016 from ravage84/patch-1
Added *.mo and .idea to .gitignore
2014-07-18 14:04:44 -04:00
Marc Würth
78fb9b559a Added *.mo and .idea to .gitignore 2014-07-18 19:11:56 +02:00
Mark Story
91b4ee8984 Merge pull request #4008 from davidyell/patch-3
Update ControllerTask.php
2014-07-18 10:50:39 -04:00
David Yell
28ec1c40a5 When specifying Session as a component and using Session flash messages, you end up with 'Paginator, Session, Session' which doesn't make sense. Added an array_unique to remove any duplicated components. 2014-07-18 15:37:22 +01:00
ndm2
f03bf8067c Add some more exception message checks 2014-07-18 14:56:10 +02:00
ndm2
bf7d01ac66 Make SMTP auth reply code checks work properly. 2014-07-18 14:53:22 +02:00
Mark Story
d62d6061b2 Merge pull request #3906 from ravage84/hash-nest-exception
Hash::nest() should throw an exception instead of returning an empty arr...
2014-07-17 09:27:38 -04:00
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves cakephp/cakephp#2063
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
2014-07-17 11:01:11 +02:00
mark_story
051d78c1a5 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Model/Model.php
2014-07-16 23:11:58 -04:00
José Lorenzo Rodríguez
b6eb5624f8 Merge pull request #3985 from dogmatic69/patch-3
Make the error message better for fixture errors
2014-07-15 14:30:18 +02:00
Carl Sutton
8d58d93636 Make the error message better for fixture errors
The stack trace has no details about which fixture is the actual problem.
2014-07-15 13:21:48 +01:00
Melvin Ross
09a7020119 Fix spacing to conform to coding standards 2014-07-14 14:54:26 -05:00
Melvin Ross
0eaf650d9f Test for new HEAD function inside HttpSocket 2014-07-14 14:34:27 -05:00
José Lorenzo Rodríguez
070d80029f Merge pull request #3976 from davidyell/patch-2
Update CONTRIBUTING.md
2014-07-14 10:40:19 +02:00
David Yell
7b4c5236cf Update CONTRIBUTING.md
Added some helpful links. Updated PHPUnit version requirement.
2014-07-14 09:37:50 +01:00