Luis Ramos
db63ba2d8f
Parse cookie values "{}" & "[]" as array
2013-10-30 15:26:50 -06:00
mark_story
a753718387
Update docs for CookieComponent::delete().
...
Refs #2182
2013-10-28 23:13:51 -04:00
mark_story
07f4779efe
Fix cookie component being inconsistent about writes.
...
Instead of treating multi-key and single key writes differently, they
should be treated consistently to allow simpler and more consistent interactions
with the stored data. This also results in fewer cookies being sent
across the wire which is an added benefit.
Fixes #2182
2013-10-28 23:13:51 -04:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
Bryan Crowe
d39ced8381
Correct 'an URL' to 'a URL' in docblocks
2013-10-22 00:09:34 -04:00
euromark
ee0ed3a43a
coding standards
2013-10-13 18:18:24 +02:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
mark_story
314ae1c8b4
Merge branch 'master' of github.com:cakephp/cakephp
2013-10-01 15:12:34 -04:00
Simon Males
c998888fe7
Do not assume CONTENT_TYPE is available.
...
In some server environments notably the CLI server, _SERVER['CONTENT_TYPE'] is not available.
In these cases, fall back to the HTTP_CONTENT_TYPE header.
Refs #GH-1661
2013-10-01 15:10:33 -04:00
Frank de Graaf
3e8af8b180
Merge pull request #1689 from dereuromark/master-cakephp-name
...
Cake to CakePHP name
2013-09-27 12:16:25 -07:00
Frank de Graaf
ceb78fee9c
Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect
...
Fixed infinite redirects when authenticated user tried to access login p...
2013-09-27 12:13:36 -07:00
euromark
df269ba0ef
Cake to CakePHP name
2013-09-27 19:36:43 +02:00
ADmad
4dbf9107a8
Fixed infinite redirects for authenticated users accessing login page.
2013-09-27 22:33:07 +05:30
Bryan Crowe
ab4bc16463
Updated Controller:: doc block and ControllerMergeVarsTest::
2013-09-25 22:53:23 -04:00
Bryan Crowe
915b51b239
Updated JavaScript casing and JsHelper references in doc blocks
2013-09-25 22:46:38 -04:00
Bryan Crowe
1393325ad1
Use instanceof instead of is_a() in Controller.php
2013-09-23 21:37:27 -04:00
euromark
e3a3946e89
address casting cs
2013-09-17 15:15:25 +02:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
ADmad
1d0c785725
Fixed setting of order in Paginator options when using model's order. Refs f680c76
, #3902
2013-09-10 22:47:31 +05:30
euromark
a36456cc87
Correct doc blocks for AuthComponent
2013-08-31 19:58:10 -07:00
euromark
1aba204ec7
remove $name where not necessary to unify this in 2.x
2013-08-25 21:19:55 +02:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
euromark
b09dc7213a
deprecate Controller::flash() and adjust some other deprecation messages.
2013-08-12 12:51:12 +02:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
Marc Würth
4c13a39f3e
Removed else clauses after redirects and added return before redirect() and flash() calls
2013-08-08 21:10:41 +02:00
euromark
fc2d28974b
remove undocumented code and uncessary in_array() checks + cleanup
2013-08-08 03:56:58 +02:00
mark_story
9efad54e31
Fix missing expiry times on cookies.
...
When writing multiple cookies in a single request with the default
expiry time, cookies after the first should continue to have the default
expiry time used.
Fixes #3965
2013-08-06 22:01:13 -04:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Simon Males
0adef209e3
Camel case SecurityComponent::blackHole() method call
2013-08-02 12:07:33 +08:00
mark_story
95b74bd9ef
Make sure ComponentCollection has the controller dependency.
...
Add setter method as changing ComponentCollection's constructor now is
not possible. This fixes issues where components that rely on
Collection->getController() in their constructor can work properly.
Fixes #3946
2013-07-30 09:09:52 -04:00
ADmad
a691e70065
Docblock and return type fixes
2013-07-29 19:13:31 +05:30
Phally
a70e004cda
Corrects bad merge.
...
Bad merge: d161b21ae1
Fixes #3938 .
2013-07-26 20:00:32 +02:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
f7eab23a5c
Strips the base off the generated URL from the AuthComponent.
...
Fixes #3922 .
2013-07-26 15:18:28 +02:00
euromark
8b21710c95
whitespace correction
2013-07-25 13:26:21 +02:00
mark_story
e03d3df0fe
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/HelperTest.php
lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
mark_story
a8f4ec0450
Simplify whitelist logic.
2013-07-16 19:33:06 -04:00
mark_story
b873186468
Fix being unable to sort on custom synthetic columns.
...
If a sort field whitelist is used we should trust its data and also
trust that the developer wanted what they asked for. This solves issues
where it was impossible to sort on synthetic columns added in custom
find types.
Fixes #3919
2013-07-16 10:19:18 -04:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
mark_story
d40c7376ce
Rebalance where URL normalization happens in AuthComponent.
...
Make URL's not include the base path when storing them in the session.
This makes future redirection simpler. When URL's are an array use
Router::url() on them.
Fixes #3916
2013-07-12 21:54:22 -04:00
mark_story
8133f72b53
Update AuthComponent to not strip when normalizing URLs.
...
Revert most of the changes done to fix #3897 originally and try
a different strategy of solving the base path issues and not breaking
apps running in a subdirectory.
Fixes #3916
2013-07-12 21:17:25 -04:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30