0x20h
95a41af9db
allow multiple roles for a rule to be specified as string or array
2012-01-13 22:02:25 +01:00
0x20h
ef5eead038
use more appropriate array key when passing options to the adapter
2012-01-13 21:55:47 +01:00
0x20h
153152642c
PHP configuration file base Acl implementation
2012-01-13 21:43:48 +01:00
mark_story
b14072aa6f
Add Router::defaultRouteClass()
...
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.
Fixes #2435
2012-01-12 22:19:55 -05:00
Mark Story
b76f8f8832
Merge pull request #260 from tPl0ch/2.1-authenticate
...
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
2012-01-12 18:53:19 -08:00
Ceeram
eaf6f0e2c1
add missing App::uses()
2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573
add missing tests
2012-01-12 13:06:24 +01:00
mark_story
97ce118294
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
mark_story
4d73f4e6a1
Fix boundaries used in multi-part messages.
...
Inline attachments should use the multipart/related boundary. Otherwise
sections will be incorrectly nested.
Fixes #2413
2012-01-11 20:44:42 -05:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
d238d8c0bb
Fix incorrect __isset()
.
...
There was a missing $ before name. Fixes issues
with dynamic properties not being handled correctly.
Fixes #2450
2012-01-09 21:47:57 -05:00
ADmad
0be71a08d6
Adding / updating I18n class test cases.
2012-01-10 01:46:19 +05:30
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc
Fix errors generated when option['order'] is undefined.
...
Fixes #2447
2012-01-08 21:55:51 -05:00
mark_story
c548b6b88a
Fix issue with find(count) and translated conditions.
...
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.
Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.
Fixes #2349
2012-01-08 20:40:25 -05:00
mark_story
9a67a70703
Fix failing test.
2012-01-07 20:24:33 -05:00
mark_story
beced84d2d
Fix illegal offset caused by TranslateBehavior.
...
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.
Fixes #2443
2012-01-07 11:58:35 -05:00
mark_story
87924414fc
Update Configure::load() to use Set::merge()
...
This fixes some of the awkward behavior that using
array_merge_recursive() could create.
Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
1991430584
Removing test that does not relate anymore to SqlServer datasource
2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d
Fixing a few SqlServer failing tests
2012-01-07 02:14:07 -04:30
mark_story
15c7493e39
Merge branch '2.0' into 2.1
2012-01-06 23:02:16 -05:00
mark_story
f23226b937
Fix failing test on windows
...
File permissions do not work the same on windows, skip the test.
2012-01-06 23:01:59 -05:00
mark_story
f22c80e9ec
Add skip for test that fails on SQLServer.
...
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
2012-01-06 22:21:54 -05:00
mark_story
e649a0516e
Fix singularization of 'foes'
...
Fixes #2424
2012-01-05 21:22:40 -05:00
Jose Lorenzo Rodriguez
7c0297a92c
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
Majna
8ad989cabe
Fix dispatching event when event key name is used.
2012-01-05 18:31:00 +01:00
mark_story
95ec741b6c
Changing SCRIPT_NAME to PHP_SELF
...
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.
Fixes #2437
Fixes #2334
Fixes #2268
2012-01-04 21:10:29 -05:00
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
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
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
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
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -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
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
Rachman Chavik
b1aae5b5ab
add fullTableName tests with empty schemaName
2011-12-29 19:17:06 +07:00
Jose Lorenzo Rodriguez
a47c8160dd
Merge remote-tracking branch 'origin/2.1' into 2.1
2011-12-28 19:29:48 -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
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
2cc38b5ba7
Fix failing test in PHP5.4
2011-12-27 19:40:51 -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