mark_story
b6de177ffa
Merge branch '2.1' into 2.2
2012-04-23 21:50:36 -04:00
mark_story
9e3fe633bb
Remove double encoding on addresses in EmailComponent.
...
CakeEmail should be handling all the encoding now, duplicating it is
silly.
Fixes #2797
2012-04-23 21:41:31 -04:00
Jose Lorenzo Rodriguez
ed0c5a4746
Merge branch '2.2-lazy-helpers' into 2.2
2012-04-22 20:40:11 -04:30
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
Renan Gonçalves
bba66f6506
Fixing call to deprecated method, using startupProcess() which will initialize components.
2012-04-13 15:57:06 +02:00
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
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
ADmad
c6ce15720e
Revert "Always use error layout when rendering error pages."
...
This reverts commit 3495422ac5
.
2012-04-06 00:47:50 +05:30
Ceeram
223604fb0d
update docblock of AclComponent
2012-04-05 13:51:00 +02: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
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
ADmad
3495422ac5
Always use error layout when rendering error pages.
2012-03-31 12:42:17 +05:30
ADmad
04c30238cb
Merge pull request #585 from shama/patch-auth-redirect
...
Default to loginRedirect, if set, on authError in AuthComponent
2012-03-30 23:19:22 -07:00
Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
Kyle Robinson Young
33ab634aba
Controller $name set optimization
2012-03-28 11:37:27 -07:00
Kyle Robinson Young
319d154aee
Default to loginRedirect, if set, on authError in AuthComponent
...
Implements #2390
Based on the patch written by @dereuromark
2012-03-27 22:51:47 -07:00
Jose Lorenzo Rodriguez
f349c9e34c
Removing hardcoded helpers from Controller and PagesController class since they are now lazy loaded
2012-03-27 23:45:01 -04:30
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
ADmad
4b49a287a6
Show plugin name in error message if a plugin component was requested
2012-03-24 00:22:50 +05:30
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
Kyle Robinson Young
db9c3e5bf3
Remove unused code and correct doc for modelClass
2012-03-20 14:44:14 -07:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
6a55749e27
Fix reading multiple keys in a single request.
...
Fixes #2676
2012-03-15 21:45:48 -04:00
Rachman Chavik
8fdb11121e
Merge branch '2.1' into 2.2
2012-03-15 20:07:26 +07:00
mark_story
f1931e43ef
Add class_exists() check for view class.
...
Check that the view class hasn't already been mapped in the autoloader
before mapping it. This allows developers to map view classes from
plugins.
Fixes #2684
2012-03-14 20:57:11 -04:00
mark_story
4e94ebe710
Fix doc blocks.
2012-03-13 21:04:56 -04:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
5687d97a98
Merge branch '2.1' into 2.2
2012-03-12 20:31:33 -04:00
mark_story
75f1a84069
Fix docs about ordering of callbacks.
...
Refs #GH-555
2012-03-11 21:35:11 -04:00
Ceeram
a4952166f7
make acl methods available in permission model
2012-03-11 17:07:42 +01:00
Thomas Ploch
79cab67be7
Adding missing 'recursive' option to DigestAuthenticate object.
...
Used integer casting in _findUser() method for 'recursive' option.
2012-03-05 11:06:46 +01:00
mark_story
9d1e88ba13
Fix error from previous commit.
2012-03-03 20:22:21 -05:00
mark_story
61aba0f0f8
Fix most coding standard issues in Controller.
2012-03-03 19:27:46 -05:00
mark_story
1ddcde7c86
Fix how $uses is handled.
...
$uses now defaults to true. All falsey values turn some features
off, and most truthy values enable them.
Fixes #2590
2012-02-28 19:35:06 -05:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
euromark
22452f61f8
type hinting controllers and views
2012-02-25 19:46:06 -05:00
Ceeram
677f0708dc
create View instance after adding model params for request
2012-02-24 18:16:53 +01:00
Mark Story
9e8152f949
Merge pull request #417 from 0x20h/php-acl
...
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
mark_story
6fda055a1e
Move initialize logic to __construct().
...
Fixes #2582
2012-02-15 14:15:44 -05:00
Thomas Ploch
574b5dcd41
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response
2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4f176d4284
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-02-12 21:04:35 -04:30
mark_story
ad09b910ee
Remove pointless comparison.
2012-02-12 10:09:25 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
ab09229d40
Update API docs
...
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
7e17da0ae8
Fix notice error when reading empty values.
...
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.
Fixes #2537
2012-02-11 11:33:04 -05:00
mark_story
6f914174a6
Fix issues with double / & leading/trailing /
...
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated. This also allows settings[actionPath] to be
permissive in what it accepts.
Fixes #2563
2012-02-11 10:29:18 -05:00
Thomas Ploch
059a5f21ed
Fixed TODO: Refactored setting of Cookies into CakeResponse.
2012-02-09 14:24:10 +01:00