TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Config item `cms.customErrorPage` is deprecated, the setting `app.debug` should be used instead.

This commit is contained in:
Samuel Georges 2014-12-06 13:22:57 +11:00
parent e9c8107cc5
commit 33be75af10
6 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
* **Build 16x** (2014-12-xx)
- Config item `cms.customErrorPage` is deprecated, the setting `app.debug` should be used instead.
* **Build 167** (2014-12-06)
- Settings pages now have a *Reset to default* button.
- The field `authorUrl` has been renamed to `homepage` in theme.yaml files.

3
app/config/app.php
View File

@ -11,6 +11,9 @@ return array(
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
| You can create a CMS page with route "/error" to set the contents
| of this page. Otherwise a default error page is shown.
|
*/
'debug' => true,

13
app/config/cms.php
View File

@ -111,19 +111,6 @@ return array(
'urlCacheTtl' => 10,
/*
|--------------------------------------------------------------------------
| Determines if a friendly error page should be used.
|--------------------------------------------------------------------------
|
| If this value is set to true, a friendly error page is used when an
| exception is encountered. You must create a CMS page with route "/error"
| to set the contents of this page. Otherwise the default error page is shown.
|
*/
'customErrorPage' => false,
/*
|--------------------------------------------------------------------------
| Determines if the asset caching is enabled.

13
app/config/testing/cms.php
View File

@ -75,19 +75,6 @@ return array(
'urlCacheTtl' => 1,
/*
|--------------------------------------------------------------------------
| Determines if a friendly error page should be used.
|--------------------------------------------------------------------------
|
| If this value is set to true, a friendly error page is used when an
| exception is encountered. You must create a CMS page with route "/error"
| to set the contents of this page. Otherwise the default error page is shown.
|
*/
'customErrorPage' => true,
/*
|--------------------------------------------------------------------------
| Determines if the asset caching is enabled.

19
modules/cms/classes/Controller.php
View File

@ -518,19 +518,18 @@ class Controller extends BaseController
}
catch (Exception $ex) {
/*
* Display a "dumbed down" error if custom page is activated
* otherwise display a more detailed error.
* Display a more detailed error if debug mode is activated.
*/
if (Config::get('cms.customErrorPage', false)) {
return Response::make($ex->getMessage(), 500);
if (Config::get('app.debug', false)) {
return Response::make(sprintf(
'"%s" on line %s of %s',
$ex->getMessage(),
$ex->getLine(),
$ex->getFile()
), 500);
}
return Response::make(sprintf(
'"%s" on line %s of %s',
$ex->getMessage(),
$ex->getLine(),
$ex->getFile()
), 500);
return Response::make($ex->getMessage(), 500);
}
}

2
modules/system/classes/ErrorHandler.php
View File

@ -55,7 +55,7 @@ class ErrorHandler
}
// Friendly error pages are used
if (Config::get('cms.customErrorPage')) {
if (!Config::get('app.debug', false)) {
return $this->handleCustomError();
}