Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
00078e007c
Import ClassRegistry before using.
...
Fixes #3594
2013-02-01 10:46:25 -05:00
ADmad
04ec9dd614
Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
...
Closes #3268
2013-01-27 21:22:11 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
631da2d04a
Update doc block.
2013-01-18 11:05:02 -05:00
ADmad
676872d623
Allow AuthComponent::$unauthorizedRedirect to be an url.
...
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585
Merge pull request #1067 from ceeram/paginatecount
...
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Ceeram
88240b2874
avoid paginate count when no results
2013-01-10 16:39:07 +01:00
mark_story
4c98e39c1f
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Controller/Component/SecurityComponent.php
2012-12-29 11:44:59 -05:00
mark_story
1117ad2f1c
Blackhole requests when the action is the blackhole callback.
...
When a user requests the blackhole callback as an action we should
blackhole that request. The blackhole callback should not be URL
accessible.
Fixes #3496
2012-12-29 11:43:06 -05:00
José Lorenzo Rodríguez
5551727a4b
Merge pull request #1051 from ADmad/2.3-paginatorcomponent
...
Throw exception if requested page number is out of range.
2012-12-28 05:52:55 -08:00
ADmad
594a19c4e1
Fix docblock
2012-12-28 02:02:05 +05:30
ADmad
fd16b8a1e5
Throw exception if requested page number is out of range.
...
Closes #3459
2012-12-28 01:37:25 +05:30
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
euromark
2b1e5b02b5
code cleanup
2012-12-21 00:40:12 +01:00
mark_story
8b0a7ee13d
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
ADmad
06c3f01af6
Fix docblock
2012-12-04 03:18:35 +05:30
ADmad
1de8ed18de
Avoiding specifying 'maxLimit' too when setting 'limit' greater than default 'maxLimit' in code.
2012-11-30 11:26:10 +05:30
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
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
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
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
Heath Nail
895fcac0cd
Improve Blowfish Docblocks
2012-11-12 14:36:43 -05:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
mark_story
3de72baeb1
Remove int cast from authentication adapters.
...
Forcing an int cast makes using the contain option difficult as you are
also required to manually set the recursive option. Omitting the
cast allows recursive to be set to null.
Fixes #3347
2012-11-06 20:27:28 -05:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
f457f07b5c
Force field validation to use sha1
...
When using blowfish as your application's hashing strategy, form field
validation would fail horribly. Forcing sha1 fixes this and restores
behavior consistent with 2.2.x
Fixes #3280
2012-10-18 21:26:26 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
ADmad
1c0492eb8b
Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591
2012-10-04 18:40:57 +05:30
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
euromark
b47e3a7d92
move charset/App.encoding into CakeResponse
2012-09-27 20:28:19 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
8dc4de5de8
converting if ($foo != false) to if ($foo)
2012-09-21 23:32:52 +01:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
euromark
213d4caa85
coding standards
2012-09-20 01:50:15 +02:00
dogmatic69
aa87791432
replacing is_integer() with is_int()
2012-09-15 11:15:01 +01:00
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
2012-09-15 02:33:05 +02:00
Mark Story
a5481f1c2c
Merge pull request #839 from dogmatic69/cleanup-request-handler
...
Cleaning up the RequestHandlerCompoent
2012-09-14 12:36:39 -07:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
dogmatic69
e09bf02467
Cleaning up the RequestHandlerCompoent
...
removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.
Removing some variable setting, returning function calls instead.
2012-09-14 17:19:40 +01:00
Mark Story
ec4333de29
Merge pull request #845 from dogmatic69/security-component-cleanup
...
You cant pass func_get_args() in PHP < 5.3
2012-09-14 08:17:11 -07:00
dogmatic69
c7faad9f78
You cant pass func_get_args() in PHP < 5.3
2012-09-14 15:29:48 +01:00
mark_story
0282194c20
Make permission denied redirects host relative.
...
This helps fix infinite redirect loops when HTTP_X_FORWARDED_HOST is
set, and fixes redirects back to external domains on authentication
errors.
Fixes #3207
2012-09-14 09:39:45 -04:00
dogmatic69
2c70319d27
Cleaning up the AuthComponent
...
Simplify if statements, return early and less variable use
2012-09-14 01:50:24 +01:00