mark_story
4bdaa2b5a0
Merge branch 'master' into 2.3
2012-12-16 13:32:38 -05:00
mark_story
1528b5c382
Don't return true when there is nothing to save.
...
Model::save() should not return true when no work has been done.
Fixes #3469
2012-12-16 13:19:14 -05:00
mark_story
71371dd9da
Add codestyle and reports-ci targets to phing.
...
This should make it easier to run and test the various code
reports + stylechecking.
2012-12-15 14:45:39 -05:00
Ceeram
54607ba0fa
fix coding standards, double whitespace
2012-12-15 18:24:29 +01:00
Mark Story
408f9dd3b0
Merge pull request #1018 from dereuromark/2.3-postlink-target
...
Put target attr on correct element when using postLink()
2012-12-15 06:58:14 -08:00
Mark Story
c67c4d3317
Merge pull request #1028 from dereuromark/2.3-view-elements
...
pluginSplit for a more meaningful notice
2012-12-15 06:57:19 -08:00
euromark
c83b454946
pluginSplit for a more meaningful exception message
2012-12-15 03:32:01 +01:00
Mark Story
ff1bd276ae
Merge pull request #1027 from dogmatic69/hash-invalid-foreach
...
fixing bug in Hash where array is not similar to the path required
fixes #3466
2012-12-14 18:17:23 -08:00
dogmatic69
2266292594
fixing bug in Hash where array is not similar to the path required
2012-12-14 22:45:52 +00:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
Mark Story
557c8edf4f
Merge pull request #1022 from ceeram/2.2-3452
...
Do not pass 5th argument to mail() when in safe mode
Fixes #3452
2012-12-13 09:28:14 -08:00
Ceeram
53b465d64e
do not pass 5th argument to mail() when in safe mode, even with a falsy value mail() will return false, fixes #3452
2012-12-13 18:22:45 +01:00
Mark Story
45f6ade800
Merge pull request #997 from rhelms/2.2.5-text-index-in-fixture
...
Cater for length part of TEXT field in indexes for MySQL'
Fixes #3428
2012-12-12 17:27:30 -08:00
Reuben Helms
07dbc4a527
Cater for length part of TEXT field in indexes for MySQL
...
Cater for length on TEXT column in index for _alterIndexes
Handle nested arrays in schemas
Used when writing indexes containg TEXT field for MySQL
Change comment style from code review
Remove stray space
Only generate length part of TEXT index column field when necessary
Override buildIndex() in Mysql instead of name()
Revert DboSource::buildIndex to previous state
Update Mysql::_alterIndexes for code reuse
Update MysqlTest to handle quoted index names.
Make code clearer, as per code review
Adjust function comments, as per code review
2012-12-13 08:33:43 +10:00
Ceeram
fee1f9e4dd
show progress of phpcs on travis
2012-12-12 14:44:25 +01:00
euromark
ae7f629eff
correct target attribute for postLinks
2012-12-12 11:23:41 +01:00
euromark
32f2426001
cache prefix for view cache to avoid collisions with domains/languages
2012-12-11 12:54:16 +01:00
mark_story
7605bc35c3
Merge branch 'zero-option'
...
Related to pull request #1013
2012-12-10 22:10:34 -05:00
mark_story
b20f6e132d
Add test for options with 0 value.
2012-12-10 22:10:00 -05:00
ceeram
1516434d61
Merge pull request #1014 from ceeram/phpcs
...
ignore last few silencers for code sniffer
2012-12-10 13:14:45 -08:00
ADmad
209f3dfe99
Moved deprecated tag
2012-12-11 01:43:10 +05:30
ADmad
c159854a17
Improve docblock
2012-12-11 00:44:42 +05:30
Ceeram
74836a1c30
ignore last few silencers for code sniffer
2012-12-10 17:57:22 +01:00
Ceeram
a8eca60fc5
fix coding standards
2012-12-10 17:40:12 +01:00
Ceeram
ec3e7afd75
Remove todo's whihc have been removed in e02eab05d5
...
and accidentally been re-added in 3e3af1f998
2012-12-10 17:06:06 +01:00
Simon Males
693ca5481e
Testing option value as a string
2012-12-10 23:02:51 +08:00
Simon Males
80773ad970
ConsoleOptionParser::_parseOption() tramples option values of 0 (zero). I believe the following condition is the culprit.
2012-12-10 22:13:38 +08:00
ceeram
505cf3dff7
Merge pull request #875 from ceeram/2.3-forminput
...
starting refactor Form->input
2012-12-10 02:30:43 -08:00
Ceeram
2d908885c8
adding short descriptions in docblock
2012-12-10 10:55:22 +01:00
Ceeram
a15481bbe9
starting refactor Form->input
2012-12-10 10:51:39 +01:00
mark_story
6292fc707d
Fix example & incorrect import.
2012-12-09 14:06:28 -05:00
mark_story
9c9cc7fba2
Expand doc block for Router::connect().
2012-12-09 13:57:50 -05:00
mark_story
2a8ebcea60
Exclude value attribute from generated file inputs.
...
Having a value attribute present causes HTML validation errors in HTML5
doctypes. It has no effect in other doctypes, and excluding it is always
valid.
Fixes #3440
2012-12-09 13:31:01 -05:00
mark_story
8a77a31620
Set translations to use the cake domain.
...
Core classes should be using either the cake, or cake_dev domain.
Fixes #3443
2012-12-09 13:25:00 -05:00
mark_story
1e49be3472
Fix stack traces not being highlighted correctly.
...
Fixes #3439
2012-12-08 20:48:45 -05:00
dogmatic69
49ea72e53e
rename the method and fix docblock return type
2012-12-08 13:10:12 +00:00
mark_story
b1aa75bec0
Fix coding standards.
2012-12-07 22:06:15 -05:00
Mark Story
38c592928d
Merge pull request #1000 from dogmatic69/validation-simplify
...
Validation simplify
Simplify internals in Model/Validation
2012-12-07 19:00:46 -08:00
mark_story
8b0a7ee13d
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
mark_story
6cf6903982
Fix incorrect argument order.
2012-12-07 14:40:27 -05:00
dogmatic69
b3dba95b7d
making uuid field check protected
2012-12-07 02:24:12 +00:00
dogmatic69
521a759911
refactor uuid checks into a method
2012-12-07 02:22:24 +00:00
Mark Story
6bfbce128f
Merge pull request #1004 from dogmatic69/hash-expand-integer-key
...
Fix issue where Hash::expand() sets incorrect array keys
Fixes #3434
2012-12-06 17:44:07 -08:00
dogmatic69
85de93a4a7
fixing issue where merge is renumbering array keys
2012-12-07 01:26:14 +00:00
Mark Story
00d178fa28
Merge pull request #999 from dogmatic69/model-simplify
...
Simplify some model code
2012-12-05 18:18:50 -08:00
Mark Story
8e6909625f
Merge pull request #1002 from dereuromark/2.3-new-lines
...
unify new lines at the end of the file
2012-12-05 18:16:50 -08:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
dogmatic69
b92b7c2d2d
removing variables that are unnecessarily used
2012-12-05 10:55:11 +00:00
dogmatic69
0ada30f3bc
removing nested if statement
2012-12-05 10:54:30 +00:00
dogmatic69
b99066ddd9
simplify some model code
...
remove nested if's and else where possible and early return.
2012-12-04 02:06:20 +00:00
