Commit graph

15023 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
eab2d8aa66 Optimizing Configure::read(), now it is possible to read arbitrarily nested keys 2012-01-14 23:22:08 -04:30
Tigran Gabrielyan
f5b62eb84c Fixed typo in DocBlock
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
2012-01-14 18:45:51 -08:00
AD7six
67f4fa0f20 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-15 01:03:48 +01:00
AD7six
22f844c48f prevent block="css" when using inline=false css 2012-01-15 01:03:17 +01:00
mark_story
c89c49c310 Enhance HtmlHelper::getCrumbs() $startText param
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.

Fixes #2475
2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252 fix magic __isset() 2012-01-14 12:42:10 -05:00
Jose Lorenzo Rodriguez
3a48f64370 Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys 2012-01-14 02:15:31 -04:30
0x20h
c6624faf76 more clear test setup 2012-01-13 23:51:18 +01:00
0x20h
1f31432a64 typo 2012-01-13 23:36:29 +01:00
0x20h
9838338976 docblocks 2012-01-13 23:34:35 +01:00
0x20h
bfaea78504 allow more elaborate regex rules 2012-01-13 23:29:23 +01:00
0x20h
b5671eb7e0 added default acl.php in app/Config 2012-01-13 23:28:55 +01:00
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
6ddf6dad36 reverting my mistake 2012-01-13 21:50:03 +01:00
0x20h
153152642c PHP configuration file base Acl implementation 2012-01-13 21:43:48 +01:00
0x20h
3f24dd7db7 Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1 2012-01-13 20:35:08 +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
533feea2b1 Merge pull request #403 from rintaun/patch-2
$action in AclShell::_getParams() should default to '*', not NULL
2012-01-12 19:08:42 -08: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
mark_story
b6040aec5a Update UpgradeShell for App classes.
Correctly move AppController and AppModel.
Fixes #2472
2012-01-12 21:37:34 -05:00
Jose Lorenzo Rodriguez
2c5cb1157f Merge branch '2.1-alltests' into 2.1 2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79 Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP 2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e Merge remote-tracking branch 'origin/2.1' into 2.1 2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9 Fixing php 5.2 specific problem, closes #2468 2012-01-12 19:13:56 -04:30
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
Ceeram
9f40e6de79 move AppShell to app/Console/Command directory 2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b rename set::getValue to set::get - and make it public 2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880 $action in AclShell::_getParams() defaults to '*', not NULL 2012-01-11 21:59:58 -05: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
Jose Lorenzo Rodriguez
1a741b853b Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877 Explicitly casting to string a variable that could in times be either string or integer 2012-01-11 21:25:22 -04:30
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
Hans-Joachim Michl
29cfdb4b41 Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries.
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de Ensure helpers are loaded in data views.
Both XmlView and JsonView should load helpers when
they use view files.

Fixes #2465
2012-01-11 20:21:56 -05:00
José Lorenzo Rodríguez
c168677257 Merge pull request #401 from starlocke/2.0-2467
2.0 2467
2012-01-11 14:38:37 -08:00
Victor Yap
cf8c1cd93b Return length 36 for uuid columns in Postgres.describe()
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.

Fixes #2467
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7 Replace smart quotes with ASCII equivalents.
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745 Add additional empty() for tablePrefix.
Fixes compatibility issues with plugins that worked correctly in
previous point releases.

Fixes #2462
2012-01-10 21:01:03 -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
a8bc916104 Move check out of the loop, and allow nulls.
Refs #2341
2012-01-10 20:15:59 -05:00
AD7six
941d503726 documentation clarification 2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3 whitespace 2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51 add a test for what happens when you nest on a field that doesn't exist 2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603 add tests for set nest method 2012-01-10 10:18:59 +01:00
AD7six
d534013570 reduce code repetition 2012-01-10 09:47:51 +01: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
mark_story
dbea15650b Add iPad to the list of mobile clients.
Fixes #2452
2012-01-09 21:33:13 -05:00
AD7six
5608d63541 allow set nest to work with any-d arrays
not just model-formatted arrays
2012-01-10 01:24:20 +01:00