mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
e3b124516f
Move where set is loaded.
...
2.1 expects that Configure will load Set.
2012-04-10 21:25:04 -04:00
mark_story
2333c8f33f
Re-factor duplicated code.
2012-04-10 21:05:42 -04:00
mark_story
45e3414d49
Add test for query string encoding.
...
Closes #2768
2012-04-10 20:08:12 -04:00
mark_story
f8966a64f2
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
81208d1fa7
Fix failing test.
2012-04-09 21:46:38 -04:00
mark_story
67743c8079
Fix missing Html escaping on string urls for assets.
...
Add HTML escaping for asset paths provided as strings.
Split existing tests up.
Fixes #2766
2012-04-09 21:20:11 -04:00
Mark Story
da9cbcf7bb
Merge pull request #603 from luisarmando/queryCacheDoc
...
Fix doc of DboSource->$_queryCache.
2012-04-09 14:35:57 -07:00
Luís Armando
bb2286bc43
Fix doc of DboSource->$_queryCache.
2012-04-09 13:30:58 -03:00
oldskool
4ceab12085
Added "missing" comma after smtp log option.
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-04-08 21:09:05 -04:00
mark_story
c718a18218
Fix coding standards errors.
2012-04-08 21:01:25 -04:00
mark_story
c6d62884c1
Fix whitespace errors.
2012-04-08 20:40:30 -04:00
ADmad
1949a20b5a
Ensure L10n::get() consistently returns the set language. Closes #2737
2012-04-09 00:49:24 +05:30
ADmad
35b48c2c8c
Fix indentation
2012-04-09 00:43:04 +05:30
mark_story
3c9e79737d
Update doc blocks for CakeNumber.
2012-04-08 12:35:44 -04:00
mark_story
8d1b5c3f24
Fix notice errors with postgres.
2012-04-07 17:22:27 -04:00
mark_story
15c94dee4d
Fix whitespace and remove duplicate method calls.
2012-04-07 14:42:25 -04:00
mark_story
eeec362741
Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash
2012-04-07 14:28:40 -04:00
mark_story
a24aca6ffc
Fix a few code standards errors.
2012-04-06 22:56:01 -04:00
mark_story
ff35762e92
Fix coding standards warnings.
2012-04-06 22:34:29 -04:00
mark_story
38b7ae3c67
Coding standards cleanup.
...
Fix coding standards
Simplify addition of empty.
Add doc block for new feature.
2012-04-06 21:47:02 -04:00
Clément Hallet
613e3824e0
add tests for the 'empty radio option' feature
2012-04-06 21:37:19 -04:00
Clément Hallet
a7a55631d8
remove 'empty' option from once checked
2012-04-06 21:37:19 -04:00
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
83789915a3
Update docs about PHP5.4 constant.
2012-04-04 21:36:56 -04:00
mark_story
8497677e97
Fix notice error when there are no requests.
2012-04-04 21:32:51 -04:00
Ceeram
2b7fe21ee0
remove all Set::extract() from core and tests
2012-04-05 01:33:57 +02:00
Ceeram
7700a0261b
only use and test SORT_NATURAL on PHP 5.4
2012-04-04 18:21:52 +02: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
