euromark
bbcdf2404e
Deprecate ssn() validation in favor of plugin Localized.
2014-08-04 16:39:43 +02:00
ADmad
713f430fc4
Merge branch 'master' into 2.6
2014-08-03 01:05:36 +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
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
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
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
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
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
08de917b3c
Fix accidental typo in SQL file.
...
Fixes #4061
2014-07-22 09:38:46 -04:00
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
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
Ceeram
02b8bce641
Fix cs error introduced after resolving merge conflict with master to 2.6
2014-07-21 14:01: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
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
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
chinpei215
ca93bbcd15
Fix CS
2014-07-14 01:21:09 +09:00
chinpei215
ace30fdd8a
Fix a race condition problem
...
Prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.
Refs #3857
2014-07-12 23:27:39 +09:00
mark_story
03c2a8b722
Unify datetime column default values between MySQL and Postgres.
...
Datetime columns should have 'default' => null, in both Postgres and
MySQL.
Fixes #3837
2014-07-11 23:10:16 -04:00
mark_story
9fd1a51a52
Merge branch 'master' into 2.6
2014-07-10 14:39:32 -04:00
mark_story
a098d96c94
Remove flaky test that was of questionable value.
2014-07-10 14:39:20 -04:00
ADmad
53259cb389
Deprecate $confirmMessage argument.
2014-07-10 23:31:51 +05:30
chinpei215
1a58b76e42
A micro optimization of h()
...
In most cases, the first argument of h() will be a string.
2014-07-10 20:53:10 +09:00