Bram Borggreve
f69fe20376
Makes sure these two files are valid JavaScript by adding comment marks
...
to them, this way editors (NetBeans 7.3 for instance) stop marking them
invalid.
2012-11-28 15:29:50 +01:00
mark_story
966c69cb98
Fix missing plugin parameters in scaffolding.
...
Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.
Fixes #3396
2012-11-27 21:59:06 -05:00
Sethrin
c727444880
Fix behavior of --plugin param
...
Since plugins are not loaded in bootstrap, this is a good place to do it.
2012-11-26 22:13:01 -05:00
euromark
c3e501b2d9
use CakeSession wrapper
2012-11-27 00:09:21 +01:00
Mark Story
85c7ef8ec4
Merge pull request #978 from andraskende/master
...
removed a non used $i, spacing between actions. changed to single quotes
2012-11-26 09:44:05 -08:00
Mark Story
6670997283
Merge pull request #983 from Schlaefer/ticket-3400
...
URL string with # in should be routed
Fixes #3400
2012-11-26 09:40:31 -08:00
Schlaefer
94a17d40da
fix ticket 3400: url string with # in it is not routed
...
See: http://cakephp.lighthouseapp.com/projects/42648/tickets/3400-url-string-with-in-it-is-not-routed
2012-11-26 16:43:47 +01:00
mark_story
739982addb
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper.php
2012-11-25 23:33:16 -05:00
mark_story
1f35d82c81
URL encode image/script/css/video paths.
...
Properly urlencode urls used in HTML attributes. This solves issues with
invalid HTML being generated when paths contain special characters.
Fixes #3395
2012-11-25 23:31:22 -05:00
mark_story
b41705f59e
Set headerCharset in EmailComponent.
...
Apply patch from 'Shota Watanabe', that sets headerCharset on CakeEmail
instances created from within EmailComponent.
Fixes #3398
2012-11-25 23:00:43 -05:00
mark_story
7402eea9eb
Remove nested conditionals.
2012-11-25 22:53:39 -05:00
mark_story
869d556d07
Fix typos & strict errors.
2012-11-24 22:42:14 -05:00
mark_story
3ba2db738f
Re-work MediaViewTest
...
it was duplicating many of the tests in CakeResponse, and missing a
few of the cases in MediaView itself.
2012-11-24 16:29:39 -05:00
ADmad
9c0939b888
A cleaner way to check if RequestHandler is loaded
2012-11-25 02:43:50 +05:30
mark_story
82d20ed948
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-24 15:44:52 -05:00
mark_story
3083b01f7d
Fix exceptions being thrown in beforeFilter breaking error pages.
...
If an exception was raised in the AppController::beforeFilter(),
requests for content-type responses would render as HTML. Extracting the
startupProcess() allows us to keep a reference to the error controller,
which can be used to force startup RequestHandlerComponent if its
enabled.
Fixes #3389
2012-11-24 15:38:42 -05:00
mark_story
e04e0a0ec8
Use non-mocked methods for tests
...
This makes reducing off by 1 second errors much easier.
2012-11-24 13:34:12 -05:00
Mark Story
780b6f01b4
Merge pull request #962 from srwebs/feature/empty-bool-operators
...
Fix: check if bool operators in find conditions are empty.
2012-11-24 10:14:22 -08:00
Mark Story
4025794b05
Merge pull request #971 from ceeram/typehint
...
Add type hinting to dispatch filters.
This should help provide more helpful errors when developers make mistakes.
2012-11-24 10:09:35 -08:00
Mark Story
e7c3034387
Merge pull request #972 from dereuromark/2.3-type-hinting
...
Remove nonsense default value.
2012-11-24 10:08:34 -08:00
Mark Story
191894c136
Merge pull request #979 from SamMousa/master
...
Added the table name to the cacheKey used by DboSource::fields()
This fixes situations where a model uses multiple tables and cache collisions were created.
Fixes #3394
2012-11-24 10:04:05 -08:00
Sam Mousa
8ef3034482
Added the table name to the cacheKey used by DboSource::fields. #3394
2012-11-24 12:22:17 +01:00
Andras Kende
b191f42cc8
removed a not used $i, spacing between actions.
...
removed a not used $i, spacing between actions. changed to single quotes
2012-11-23 16:01:04 -08:00
euromark
18fb132d41
some doc block corrections as well a !! to (bool) convertion
...
remove nonsense default value
2012-11-22 14:28:09 +01:00
Ceeram
5741ac1828
add type hinting to dispatch filters
2012-11-22 10:02:36 +01:00
mark_story
0d29861423
Fix order for finds
...
This should solve more occasional errors in postgres on travis.
2012-11-21 21:52:23 -05:00
Mark Story
5870d71e84
Merge pull request #967 from ceeram/2.3-phpcs
...
fix coding standards
2012-11-21 09:45:12 -08:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
mark_story
587c7071b4
Fix incorrect order of arguments when added out of sequence.
...
Fixes #3385
2012-11-20 22:42:44 -05:00
Mark Story
04d4abfa53
Merge pull request #965 from frederikweber/patch-1
...
Send charset in Content-Type when Content is JSON.
2012-11-19 17:08:57 -08:00
ceeram
4611c987db
Merge pull request #959 from ceeram/phpcsw
...
Make phpcs pass
2012-11-19 15:10:47 -08:00
mark_story
fb275c5fa2
Fix warnings from file_get_contents() in Xml::build()
...
Use HttpSocket to get proper exceptions when trying to load XML from
remote servers.
Fixes #3379
2012-11-19 14:46:45 -05:00
mark_story
6b4afb989e
Fix Set::merge() failing to merge correctly.
...
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.
Fixes #3384
2012-11-19 14:03:03 -05:00
ADmad
165035faa8
Merge pull request #963 from sarce/paginator-tag
...
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-18 22:41:10 -08:00
frederikweber
58df515a6d
Add test for Content-Type JSON and charset.
2012-11-18 23:44:37 +01:00
Linus Probert
d6bf0dc003
Added additional test for View::startIfEmpty($name)
2012-11-18 16:30:47 +01:00
frederikweber
374dd55270
Changed else if to elseif.
2012-11-18 14:06:46 +01:00
frederikweber
9b479958f6
Send charset=UTF-8 if Content-Type is JSON.
2012-11-18 12:25:45 +01:00
frederikweber
ac0b9b285d
Send charset in Content-Type when Content is JSON.
2012-11-18 11:39:17 +01:00
Nicolas
a77e46cbfd
Added accidentally removed tests back in.
2012-11-17 23:14:40 +01:00
mark_story
c504fcfdf0
I'm a tool, fix test and remove debug().
2012-11-17 14:57:03 -05:00
mark_story
a3ddff4aa7
Fix failing test & simplify code.
2012-11-17 14:51:57 -05:00
Mark Story
c752b75904
Merge pull request #958 from planardothum/feather
...
Frameworks compatible Breadcrumbs.
2012-11-17 11:23:43 -08:00
Nicolas
1b704fb7cf
Unit tests added.
2012-11-17 19:34:02 +01:00
Sebastián Arce
d0d15701b3
prev() and next() methods of PaginatorHelper now possible to place the 'tag' option to 'false' for disable the wrapper.
2012-11-17 15:26:08 -03:00
Nicolas
9c7f357029
Check if bool operators in find conditions are empty.
2012-11-17 12:39:08 +01:00
euromark
83b0c5042f
correct the doc block
2012-11-16 23:32:56 +01:00
Mark Story
26e31848c6
Merge pull request #954 from rhelms/feature/2.3-mock-model
...
Add CakeTestCase::getMockForModel convenience method
Fixes #3364
2012-11-16 10:03:35 -08:00
Ber Clausen
1c281c9a2b
Calling Form->input() with 'errorMessage'=>false should trigger field
...
error, but not render error message (HTML element).
2012-11-16 15:02:01 -03:00