mark_story
50a4b792be
Clean up code in FormHelper::dateTime()
...
Remove $$ variables and split a huge method into smaller pieces.
2012-10-25 21:28:01 -04:00
mark_story
c359e4b689
Fix issue with array based values and interval.
...
Fixes #3299
2012-10-25 20:46:54 -04:00
Mark Story
e6512c56fd
Merge pull request #915 from bar/master-cake-error
...
Avoid duplicating RequestHandler component when rendering Errors.
2012-10-25 17:24:00 -07:00
Mark Story
d051b69312
Merge pull request #914 from dereuromark/2.3-i18n-extract
...
Normalize paths in generate pot files to always use /
Fixes #3306
2012-10-25 17:12:55 -07:00
Renan Gonçalves
02cfacec41
Make app/Console/cake pwd insensitive on Mac OS X.
...
Follow up of [36e15a065b
].
2012-10-26 01:14:09 +02:00
Ber Clausen
c741f60367
Make Model::find('first') always return an array.
2012-10-25 17:57:37 -03:00
Ber Clausen
d269588e78
Avoid duplicating RequestHandler component.
2012-10-25 14:57:16 -03:00
euromark
cc436146be
making tests pass on windows again
2012-10-25 17:37:35 +02:00
euromark
f3bbe89ede
solves ticket 3306
2012-10-25 17:08:52 +02:00
mark_story
528671f468
Replace Set with Hash.
2012-10-25 10:07:39 -04:00
Mark Story
555bfc32ea
Merge pull request #909 from dereuromark/master-magic-input-bc
...
Master magic input bc
Fixes #3295
2012-10-25 07:05:31 -07:00
mark_story
83d307e545
Try to set order on more things.
2012-10-24 22:38:15 -04:00
mark_story
9e0778951a
Add some fixed orders.
...
Hopefully this makes tests in postgres more reliable.
2012-10-24 21:27:01 -04:00
mark_story
5786245832
Fix lint error.
2012-10-24 21:21:11 -04:00
mark_story
c4b9fa6c7a
Fix failing tests.
2012-10-24 21:00:56 -04:00
Mark Story
2841611c0f
Merge pull request #911 from dogmatic69/type-checks
...
Type checks
2012-10-24 17:26:30 -07:00
Ceeram
6fc019e74d
afterRender should not be triggered when callbacks is false
2012-10-25 01:16:16 +02:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
d2010308d4
Merge branch 'master' into 2.3
2012-10-23 20:20:52 -04:00
euromark
2ac08bf024
fix whitespace
2012-10-23 19:04:52 +02:00
mark_story
3729ac1f2f
Fix issue where the incorrect meridian would be selected.
...
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected. Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.
Fixes #3299
2012-10-23 12:47:12 -04:00
euromark
044cf60b69
move the test case to its own method
2012-10-23 16:07:43 +02:00
euromark
5064601c6f
adding test case
2012-10-23 15:11:23 +02:00
euromark
9a9ac6f3a7
allow input type=number to also be magic
2012-10-23 15:11:22 +02:00
ADmad
3ee267d7ef
Moving the mb_* functions to bootstrap.php
2012-10-23 16:58:07 +05:30
ADmad
1763f46340
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
ADmad
922d9865fa
Moving multibyte encoding setting to bootstrap.php. Closes #3290
2012-10-23 13:20:01 +05:30
Mark Story
746eaf9389
Merge pull request #894 from dereuromark/comp-fix-save-all
...
BC mod for saveAll()
2012-10-22 18:40:38 -07:00
Mark Story
d75bd48c25
Merge pull request #905 from dereuromark/2.3-ini
...
allow ini files to have separators between sections for better readability
2012-10-22 18:38:49 -07:00
mark_story
ed6ff92296
Remove bad test.
2012-10-22 20:55:56 -04:00
mark_story
a0a61b5980
Fix issue where createSchema() would omit primary keys sometimes.
...
Fix missing primary key SQL when using the primary flag + other indexes.
Fixes #3292
2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
1c0c8604c8
Pushed before fxing error in test case, I suck. Refs #3291
2012-10-22 23:09:31 +02:00
Jose Lorenzo Rodriguez
9dc3b243ac
Correct inflection rules for cookies, fixes fixes #3291
2012-10-22 23:07:42 +02:00
AD7six
35686c9293
use the right language domain
...
these messages are for developers, not end users
2012-10-22 10:55:40 +02:00
Jose Lorenzo Rodriguez
c00d58b4ef
Fixed problems with resetSequence() not using the correct sequence name
...
in postgres
2012-10-21 16:32:52 +02:00
mark_story
d4631a6ead
Remove bad test.
2012-10-20 21:03:38 -04:00
mark_story
0b0b361e48
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
2012-10-20 20:48:11 -04:00
mark_story
08556ab879
Fix saveAssociated() with validate=first, atomic=false
...
When using the above options & validation errors on the associated
models, saving would not be aborted.
Fixes #3285
2012-10-20 15:12:05 -04:00
mark_story
888b1f4795
Fix issue with using contain() and query[contain]
...
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.
Fixes #3287
2012-10-20 14:51:52 -04:00
mark_story
f457f07b5c
Force field validation to use sha1
...
When using blowfish as your application's hashing strategy, form field
validation would fail horribly. Forcing sha1 fixes this and restores
behavior consistent with 2.2.x
Fixes #3280
2012-10-18 21:26:26 -04:00
euromark
5a8092fc1b
allow ini files to have separators between sections for better readability
...
dump now makes spaces between sections in init files
2012-10-18 17:20:15 +02:00
mark_story
ea467e72d7
Swap isset() for array_key_exists()
...
Fixes #3283
2012-10-17 17:23:08 -04:00
mark_story
307759516b
Try to make tests less fragile.
2012-10-15 22:54:03 -04:00
mark_story
1cc82ff39f
Merge branch 'master' into 2.3
2012-10-15 21:48:55 -04:00
mark_story
6d3ae3b83c
Fix missed use of VERSION.
2012-10-15 21:48:36 -04:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
mark_story
f6c5ceb77a
Use id() as VERSION doesn't exist in phpunit 3.6
2012-10-15 21:38:10 -04:00
mark_story
f89fe0e1ef
Fix tests that fail in PHPUnit 3.7
...
Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
2012-10-15 21:36:12 -04:00
Mark Story
805b44f17c
Merge pull request #904 from ataylor32/remove-trailing-whitespace
...
Remove trailing whitespace from comments
2012-10-15 17:30:28 -07:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00