mark_story
3e1c567f08
Remove duplicate methods.
...
Fix regression where #1345 was re-introduced.
Fixes #2434
2012-01-03 21:11:45 -05:00
mark_story
c43b099894
Fix null bytea columns.
...
Apply patch from 'opiazer' Fixes #2432
2012-01-03 20:51:56 -05:00
mark_story
101148c10f
Return 0 if there is no result.
...
The documented return is an integer. Stick to that.
Fixes #2430
2012-01-02 20:18:01 -05:00
mark_story
b4faa00703
Adding error to find(threaded).
...
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
2012-01-02 13:46:35 -05:00
Mark Story
81d7ef46c5
Merge pull request #392 from vesln/resource-map
...
Resource map
2012-01-02 05:23:30 -08:00
Veselin Todorov
3eea2e2073
Adding resourceMap accessor test
2012-01-02 13:53:32 +02:00
Veselin Todorov
8864805277
Adding resourceMap accessor
2012-01-02 13:53:21 +02:00
mark_story
997aa8a37b
I'm an idiot. Fix the parse error.
2012-01-01 21:29:13 -05:00
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3
Add Windows Phone OS to mobile browser list.
...
Fixes #2428
2012-01-01 12:57:35 -05:00
José Lorenzo Rodríguez
c90aafb1c7
Merge pull request #390 from shama/patch-app-doc-type
...
Fix types in docblocks in App class
2011-12-31 15:48:50 -08:00
Kyle Robinson Young
8b9770d34d
Fix types in docblocks in App class
2011-12-31 14:51:24 -08:00
mark_story
c3e9a931d6
Should have been association name, not field name.
2011-12-30 20:54:26 -05:00
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -05:00
mark_story
6c902a19b3
Fix issue with rendering elements inside blocks.
...
Fixes exceptions being raised when you tried to render
elements inside blocks. Instead compare the number of open blocks.
This should not change before/after rendering a view.
2011-12-30 14:56:31 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196
Merge pull request #387 from shama/patch-text-truncate
...
Prevent TextHelper::truncate() from breaking HTML
2011-12-30 07:15:35 -08:00
mark_story
ed43c685b9
Fix string offset error in PHP 5.4
2011-12-29 22:10:12 -05:00
mark_story
ff29b194ed
Fix version config.
2011-12-29 20:12:45 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
tigrang
015f9957be
Changed order of controller var merging
...
From AppController -> PluginAppController to
PluginAppConroller -> AppController
Fixes #2420
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-29 20:02:00 -05:00
mark_story
9cdf8042bf
Fix issue with scripts_for_layout compatibility.
2011-12-29 11:58:05 -05:00
mark_story
5936fa5930
Fix strict errors.
2011-12-29 11:10:25 -05:00
Ceeram
929a40364f
adding magic method__isset() for overloaded properties
2011-12-29 16:22:08 +01:00
Rachman Chavik
1d333fd8b7
fullTableName needs to check for empty schemaName
2011-12-29 19:18:37 +07:00
Rachman Chavik
b1aae5b5ab
add fullTableName tests with empty schemaName
2011-12-29 19:17:06 +07:00
mark_story
339259c841
Update version to 2.0.5
2011-12-28 22:00:12 -05:00
Jose Lorenzo Rodriguez
a47c8160dd
Merge remote-tracking branch 'origin/2.1' into 2.1
2011-12-28 19:29:48 -04:30
Jose Lorenzo Rodriguez
ae8140ffa2
Merge branch '2.1-events' into 2.1
2011-12-28 19:29:12 -04:30
Mark Story
83b28c42cf
Fix failing tests and missing boundary markers.
...
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83
Add test for inline attachments.
2011-12-27 22:51:47 -05:00
Mark Story
0e4af546d6
Update sending attachments.
...
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now. Re-built the internals
of message rendering to remove duplication and redundant code paths.
Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
53598c722c
Pulling out view rendering from boundary setting.
2011-12-27 22:51:47 -05:00
Mark Story
34eedcc017
Add a few regression tests for CakeEmail.
2011-12-27 22:51:47 -05:00
Mark Story
bbef4aa36d
Convert assertions to assetContains.
2011-12-27 22:51:47 -05:00
Mark Story
8414d37e48
Add docblock examples for attachments.
2011-12-27 22:51:47 -05:00
Jose Lorenzo Rodriguez
6ac3b10a5e
Making beforeDelete trigger first on behaviors and then in model
2011-12-27 22:49:50 -04:30
Mark Story
21ac8492b1
Adding an int cast.
...
PHP 5.4 doesn't like floats for string offsets.
2011-12-27 21:57:33 -05:00
Mark Story
e9813d7a97
Fix errors with illegal string offsets.
...
If $_list becomes a string notice errors are triggered when trying
to do offsets in PHP 5.4
2011-12-27 21:38:14 -05:00
Mark Story
2cc38b5ba7
Fix failing test in PHP5.4
2011-12-27 19:40:51 -05:00
mark_story
0b9b23fe38
Fix caching of paths when a plugin param is used.
...
Plugin paths should not be cached as it makes subsequent look-ups
behave incorrectly.
2011-12-27 19:24:16 -05:00
mark_story
69b1c33f1f
Fix extending in loops.
2011-12-27 19:24:16 -05:00
mark_story
70981d05ca
Throw an exception when a view extends itself.
2011-12-27 19:24:15 -05:00
mark_story
047e93e285
Clean up internal API's
...
- There was some duplication in element() for handing plugins.
- Deprecate options[plugin] for element()
- Add file omitted in previous commit.
2011-12-27 19:24:15 -05:00
Ceeram
d8cbe8a1f7
Cleaning up
...
- Adding docblock
- Adding visibility keyword
- Update assertion methods.
- Split up tests into smaller methods.
2011-12-27 19:23:52 -05:00
Ceeram
210f8c9e2c
adding tests for plugindot syntax in view filenames
2011-12-27 19:22:21 -05:00
Ceeram
a72ccf28e3
accept dot syntax for element,view and layout filename from plugins fixes #2247
2011-12-27 19:22:21 -05:00
Mark Story
7f46ede097
Add more complete api docs for label()
...
Fixes #2415
2011-12-27 10:08:54 -05:00
Jose Lorenzo Rodriguez
33705f24bf
returning the correct query in beforeFind in case callbacks return true
2011-12-26 13:38:04 -04:30
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30