Commit graph

15983 commits

Author SHA1 Message Date
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
ADmad
61602990de Merge pull request from bcrowe/fix-caketimedocs
Updated CakeTime::i18nFormat() doc block description
2013-09-17 22:02:14 -07:00
Kamisama
5d509e23c2 Throw exception when selected serializer is not installed 2013-09-18 00:46:21 -04:00
Kamisama
bd3f005ab6 Add serializer option to Memcached Cache engine
Add option to select a serializer engine among php, json or igbinary
2013-09-18 00:29:48 -04:00
Bryan Crowe
5c329b4875 Updated CakeTime::i18nFormat() doc block description 2013-09-17 23:09:46 -04:00
mark_story
809f6129e0 Update docs for HttpSocket methods.
delete() uses the request body, not the query string.
2013-09-17 21:17:26 -04:00
Mark Story
da805783fd Merge pull request from bcrowe/fix-jsonviewdocs
Corrected some grammar in the JsonView class doc blocks
2013-09-17 17:37:26 -07:00
Bryan Crowe
24a522f972 Updated doc block for JsonView's subDir property 2013-09-17 20:25:32 -04:00
Bryan Crowe
878e599976 Corrected some grammar in the JsonView class doc blocks 2013-09-17 20:15:18 -04:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
Mark Story
eea56d3f23 Merge pull request from dereuromark/master
cs corrections
2013-09-17 07:05:14 -07:00
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +02:00
euromark
12f2f729c8 more cs 2013-09-17 14:53:07 +02:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf Fix label element for attributes not matching their inputs.
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for 
and lack of tests for create() + radio().

Fixes 
2013-09-16 22:38:28 -04:00
Mark Story
aee71fad11 Merge pull request from spiliot/patch-1
removed duplicate test case in CakeRequest Referer
2013-09-16 14:52:30 -07:00
spiliot
37c9832dc1 removed duplicate test case
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
mark_story
4ea6c158d1 Fix wording and remove trailing spaces. 2013-09-16 12:04:29 -04:00
Mark Story
9df34967f5 Merge pull request from ShinKenDo/patch-1
Improved wording of Model::invalidFields()
2013-09-16 09:03:53 -07:00
Jerome Roethlisberger
3a4a0e54eb Improved wording of Model::invalidFields()
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
2013-09-16 16:13:58 +02:00
euromark
c8b18164c5 fix test 2013-09-16 00:49:01 +02:00
euromark
910ee33710 remove wrong trailing slash 2013-09-16 00:40:37 +02:00
mark_story
085636ea1b Update version number to 2.4.1 2013-09-14 22:07:19 -04:00
mark_story
7379d32b59 Simplify & fix phone number validation.
The changes made in fa3d4a0bb5 tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.

Fixes 
2013-09-13 23:05:40 -04:00
José Lorenzo Rodríguez
d40f9f7f67 Merge pull request from dereuromark/2.5-logging
2.5 logging - deprecate/disallow magic logging
2013-09-13 00:29:22 -07:00
Mark Story
2ec54fba50 Merge pull request from ravage84/cakelog_config
Corrected a CakeLog example in a DocBlock about scopes and types
2013-09-12 20:20:51 -07:00
Marc Würth
0a7d5b9c3f Corrected a CakeLog example in a DocBlock about scopes and types
> Its important to remember that
> when using scopes you must also define the `types` of log messages
>  that a logger will handle. Failing to do so will result in the logger
>  catching all log messages even if the scope is incorrect.

According to this the previous example would fail to log correctly.
2013-09-13 03:07:46 +02:00
euromark
61b05c40c6 remove autologging 2013-09-13 02:28:25 +02:00
mark_story
ba4afcc074 Fix incorrectly encoded address fields.
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.

Fixes 
2013-09-12 20:14:11 -04:00
mark_story
a2bd91638e Merge branch 'master' into 2.5 2013-09-12 19:47:13 -04:00
Mark Story
ba016c2c68 Merge pull request from dereuromark/master-cleanup
Master cleanup
2013-09-12 16:46:18 -07:00
euromark
a796b26f13 fix renderLayout and update deprecated and outdated code 2013-09-13 00:09:31 +02:00
Mark Story
8f2bd51834 Merge pull request from ravage84/sqlserver-elseif
Replaced two elseifs by if in sqlserver datasource
2013-09-11 16:22:46 -07:00
Marc Würth
446792987a Replaced two elseifs by if in sqlserver datasource 2013-09-11 23:15:05 +02:00
Mark Story
c5351c5b65 Merge pull request from sime/view-get-default-param
View get default param
2013-09-11 09:05:59 -07:00
Simon Males
8311a16ebd Accurate description of what is returned 2013-09-11 22:28:09 +08:00
Simon Males
50ad043092 View::get() default param test 2013-09-11 22:22:50 +08:00
Simon Males
0c3197a435 View::get() to support a fallback param 2013-09-11 11:10:27 +08:00
Mark Story
a980fd92b9 Merge pull request from ataylor32/pr-printf
Make the "pr" function use `printf` instead of `echo sprintf`
2013-09-10 19:29:05 -07:00
Adam Taylor
186f2a27e0 Make the "pr" function use printf instead of echo sprintf 2013-09-10 19:52:18 -06:00
Mark Story
fd50c5277e Merge pull request from ADmad/fix-paginator-order
Fix setting of order in Paginator options when using model's order. 

Refs 
2013-09-10 13:41:51 -07:00
Mark Story
232bbc0bae Merge pull request from dereuromark/master
add missing params for parent call
2013-09-10 13:01:42 -07:00
euromark
beff12d8a5 add missing params for parent call 2013-09-10 21:19:30 +02:00
ADmad
e77a75147f Merge pull request from bar/php54-afterFind
Update afterFind() callback signature to be PHP5.4+ compliant.
2013-09-10 11:55:07 -07:00
ADmad
1d0c785725 Fixed setting of order in Paginator options when using model's order. Refs f680c76, 2013-09-10 22:47:31 +05:30
Ber Clausen
0a52061d86 Update afterFind() callback signature to be PHP5.4+ compliant. 2013-09-10 14:15:01 -03:00
Mark
994a5b00b6 Merge pull request from bar/php54-afterSave
Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.
2013-09-10 04:04:04 -07:00
mark_story
fc2e1fac4e Fix clearing groups with FileCache and no prefix.
If you used FileCache + groups + an empty prefix cached files would not
be cleared as strpos() would fail.
2013-09-09 22:24:18 -04:00
Ber Clausen
867d4b312d Update afterSave() callback signature to be PHP5.4+ compliant. 2013-09-09 21:34:11 -03:00
Ber Clausen
98a32c334a Fix CS. 2013-09-09 21:25:22 -03:00