Clément Hallet
00b2c49af2
FormHelper : use the empty option for radio buttons
2012-04-06 21:37:18 -04:00
mark_story
4eea72205b
Merge branch '2.1' into 2.2
2012-04-06 21:34:11 -04:00
mark_story
fe1a6d7d7e
Fragments should not be urlencoded()
...
encoding them breaks fragments for client side
applications like backbone.js
Fixes #2755
2012-04-06 21:32:37 -04:00
mark_story
b3419be0fb
Fix issues loading response classes from plugins.
...
Fixes #2759
2012-04-06 20:38:14 -04:00
mark_story
790d9beeb7
Always reconfigure global state.
...
Fixes issues wher the test suite with no fixtures could hit
a non test connection.
Fixes #2743
2012-04-06 20:27:56 -04:00
Mark Story
d000b3aa97
Merge pull request #601 from luisarmando/infoUpgrade
...
Outputs messages of which plugin is going to have locations upgrade.
2012-04-06 17:12:09 -07:00
Luís Armando
5b324f8024
Outputs messages of which plugin is going to have locations upgrade.
2012-04-06 18:06:18 -03:00
ADmad
863094da58
Fixing eg. code in doc block
2012-04-07 00:28:59 +05:30
Ceeram
c2a8fca00c
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
30268f6a08
Only check for existing method expresion() when it actually will be called.
...
Datasources that use calculate() should not be forced to implement expression() as well
2012-04-05 23:15:18 +02:00
ADmad
c6ce15720e
Revert "Always use error layout when rendering error pages."
...
This reverts commit 3495422ac5
.
2012-04-06 00:47:50 +05:30
Ceeram
8c631fa022
add test to show label options in inputDefaults
2012-04-05 17:47:08 +02:00
mark_story
5c590aad09
Add missing ClassRegistry import.
...
Fixes #2757
2012-04-05 08:33:12 -04:00
Ceeram
223604fb0d
update docblock of AclComponent
2012-04-05 13:51:00 +02:00
mark_story
8497677e97
Fix notice error when there are no requests.
2012-04-04 21:32:51 -04:00
ADmad
1cc5206442
Merge branch '2.1-dbosource' into 2.1
2012-04-04 19:58:48 +05:30
ADmad
93639a7c43
Fixed bug where associated model's afterfind was not triggered in particular case
2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6
Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750
2012-04-04 15:07:45 +02:00
mark_story
77f698dbcd
Fix which request is used for error pages.
...
The most recent request in the request stack should be used,
as it is most likely the request containing an exception.
Fixes incorrect error pages generated inside requestAction() calls.
Fixes #2746
2012-04-03 13:24:36 -04:00
mark_story
f09e5a36d2
Fix SessionComponent::id() not returning the id.
...
When reading the id() with SessionComponent, the session should
auto start, otherwise you could get null back. This makes the return
more consistent.
Fixes #2749
2012-04-03 13:21:52 -04:00
ADmad
7ed90c72ae
Updating API docblock for Model::query()
2012-04-03 19:06:41 +05:30
mark_story
72cb96b727
Fix a few more coding standards errors.
2012-04-02 23:23:53 -04:00
mark_story
18296d2bf6
Fix a few coding standards errors.
2012-04-02 23:19:05 -04:00
Ceeram
34a730dfd8
ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709
2012-04-02 18:48:02 +02:00
mark_story
4e67698506
Fix issues with SQLServer + boolean columns.
...
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.
Fixes #2439
2012-04-01 22:10:05 -04:00
Mark Story
50de1289a9
Merge pull request #592 from suzuki/2.2-cakeemail
...
Fixed CakeEmail::reset, no initialize charset and headerCharset
2012-04-01 18:19:08 -07:00
Norio Suzuki
26b93afc3c
fixed CakeEmail::reset, no initialized charset and headerCharset property
2012-04-01 23:42:18 +00:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
mark_story
ee7a224639
Fix a code style warning.
2012-03-31 21:40:20 -04:00
mark_story
6677127c8e
Fix coding standard error.
2012-03-31 21:38:39 -04:00
mark_story
990fbcdea0
Remove duplicated code backup.
...
This restoration/backup is done in the parent class.
2012-03-31 13:32:44 -04:00
Mark Story
54bfa4cc05
Merge pull request #587 from shama/patch-mb-number
...
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
2012-03-31 10:22:25 -07:00
ADmad
3495422ac5
Always use error layout when rendering error pages.
2012-03-31 12:42:17 +05:30
ADmad
04c30238cb
Merge pull request #585 from shama/patch-auth-redirect
...
Default to loginRedirect, if set, on authError in AuthComponent
2012-03-30 23:19:22 -07:00
ADmad
1763219053
Adding tests for getting session id when using DatabaseSession. Disproves #2734
2012-03-31 00:40:44 +05:30
Ceeram
65f25ed910
test added to show pagination conditions will not result in incorrect count, refs #2736
2012-03-30 19:06:01 +02:00
Ceeram
eba0b1f999
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-03-28 22:34:31 +02:00
Ceeram
7df6477526
add test to prove #2723
2012-03-28 22:24:02 +02:00
José Lorenzo Rodríguez
c67feb0629
Merge pull request #589 from shama/patch-substr-optimizations
...
substr() optimizations throughout core
2012-03-28 13:23:16 -07:00
Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
ADmad
47558e8db5
Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723
...
This reverts commit 96f73d6392
, reversing
changes made to 9d017c2b5c
.
Conflicts:
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
2012-03-29 01:33:21 +05:30
ADmad
349c1755d8
Merge pull request #588 from shama/patch-controller-optimization
...
Controller $name set optimization
2012-03-28 12:09:40 -07:00
Kyle Robinson Young
33ab634aba
Controller $name set optimization
2012-03-28 11:37:27 -07:00
Kyle Robinson Young
4370bf280a
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
...
Fixes #2602
2012-03-28 10:46:31 -07:00
Rachman Chavik
6fa30db504
CakeEmail can use theme when rendering template
2012-03-28 22:01:30 +07:00
Kyle Robinson Young
319d154aee
Default to loginRedirect, if set, on authError in AuthComponent
...
Implements #2390
Based on the patch written by @dereuromark
2012-03-27 22:51:47 -07:00
Kyle Robinson Young
c700fedbf8
Update test suite header version to 2.2
...
Conflicts:
lib/Cake/TestSuite/templates/header.php
2012-03-27 19:52:58 -04:00
Mark Story
0443fe1507
Merge pull request #584 from shama/patch-inpath-test
...
Add test/doc for reverse Folder::inPath()
2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9
Add test/doc for reverse Folder::inPath()
2012-03-27 11:55:13 -07:00
Jose Lorenzo Rodriguez
4f6f041730
Using same serialization strategy for request object in cached views, this prevents some failing tests in environments
...
with different charsets
2012-03-27 00:57:15 -04:30