Commit graph

122 commits

Author SHA1 Message Date
mark_story
82d20ed948 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-24 15:44:52 -05:00
mark_story
3083b01f7d Fix exceptions being thrown in beforeFilter breaking error pages.
If an exception was raised in the AppController::beforeFilter(),
requests for content-type responses would render as HTML. Extracting the
startupProcess() allows us to keep a reference to the error controller,
which can be used to force startup RequestHandlerComponent if its
enabled.

Fixes #3389
2012-11-24 15:38:42 -05:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
ADmad
1476ccbe7e Revert "Merge pull request #937 from bar/master-controlelr-test"
This reverts commit ba8f278075, reversing
changes made to 4c6c3b0554.
2012-11-03 21:54:00 +05:30
Ber Clausen
670bf3c47c Revert "Removing unneeded App::uses() call" as it causes ControllerTest
to fail.

This reverts commit 0fb4d1d3d8.
2012-11-02 21:01:57 -03:00
mark_story
60f9626838 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
ADmad
cc6b699db4 Added missing App::uses() statement. Closes #3331 2012-11-02 02:16:02 +05:30
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02: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
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
57f81da983 Fix variable naming. 2012-10-04 11:27:24 -04:00
mark_story
feda6e06a0 Reduce some code complexity. 2012-10-03 22:59:35 -04:00
ADmad
0fb4d1d3d8 Removing unneeded App::uses() call 2012-10-04 00:24:27 +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
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
393849a9ba Make exception rendererer more resiliant
Exceptions in beforeRender() should render correct error pages.

Fixes #3235
2012-09-27 21:39:22 -04:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
Ceeram
d4986b5f24 add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response.
Tests added.
2012-08-09 14:52:05 +02:00
ADmad
8931b74ba2 Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074 2012-08-05 02:36:29 +05:30
mark_story
ab6fab6675 Add missing import. 2012-07-21 20:42:46 -04:00
mark_story
e2781a536a Fix whitespace error. 2012-06-23 21:03:15 -04:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
ADmad
9ce216b09d Revert "Fix missing view variables."
Commit 7416c53 shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.

This reverts commit 7416c530a2.
2012-06-11 02:36:51 +05:30
ADmad
fa0d1c7997 Fix layout path value causing View to generate layout paths with extra slash at end 2012-06-10 22:19:39 +05:30
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Rachman Chavik
07d9a75fcb Helpers in custom CakeErrorController are lost
Since many exceptions do not have its own 'template' file, customized
APP/Controller/CakeErrorController with its own list of helpers could be
ignored.

This happens becase ExceptionRenderer is forced to to use _outputMessageSafe
when a template is missing.  This causes Controller::$helpers to be reset with
default values.
2012-06-01 15:28:06 +07:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
Rachman Chavik
e6860fb856 changing LOG_ERROR to LOG_ERR in core files 2012-05-13 18:51:57 +07:00
mark_story
7416c530a2 Fix missing view variables.
When rendering a exception caught when rendering
an exception, some view variables were missing causing fatal
errors.

Fixes #2843
2012-05-05 13:30:18 -04:00
mark_story
efe836480b Fix error when rendering fatal error page.
If you included parse errors in AppController, the fatal error
page would not correctly display.
2012-05-05 12:54:41 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Thomas Ploch
daa695b4d3 Added NotImplementedException with status code 501 2012-04-25 15:44:48 +02:00
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
Jose Lorenzo Rodriguez
565a58f784 Introducing dispatcher filters and adding tests for them 2012-04-16 00:36:08 -04:30
Juan Basso
9beaa9602f Unified error handlers. Now the regular error handler will receive the fatal errors too. 2012-04-14 16:08:36 -04:00
Juan Basso
1428659f88 Moved the fatal error detection to App::shutdown and keeping the fatal error handler cleaner. It helps to be extended by applications/plugins. 2012-04-14 16:08:35 -04:00
Juan Basso
440f0c38eb Added a handler for fatal errors, showing internal server error page when debug is disabled or a custom fatal error page when enabled. 2012-04-14 16:08:35 -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
mark_story
77f698dbcd Fix which request is used for error pages.
The most recent request in the request stack should be used,
as it is most likely the request containing an exception.

Fixes incorrect error pages generated inside requestAction() calls.

Fixes #2746
2012-04-03 13:24:36 -04:00
ADmad
3495422ac5 Always use error layout when rendering error pages. 2012-03-31 12:42:17 +05:30
ADmad
0832e18e9e Adding separate error layout for CakeErrorController as using default layout often caused nested errors. Closes #2682 2012-03-18 14:05:41 +05:30
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
60989ad6c8 Fix coding standard issues in Error/ 2012-03-03 19:46:15 -05: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