tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE: Added Debug::$friendly_error_header and Debug::$friendly_error_detail for customising the friendly error message. (from r69855)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88632 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-10-12 03:20:24 +00:00
parent 1380c3f53c
commit c347278dda
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/Debug.php
View File

@ -48,6 +48,16 @@ class Debug {
*/ */
protected static $log_errors_to = null; protected static $log_errors_to = null;
/**
* The header of the message shown to users on the live site when a fatal error occurs.
*/
public static $friendly_error_header = 'There has been an error';
/**
* The body of the message shown to users on the live site when a fatal error occurs.
*/
public static $friendly_error_detail = 'The website server has not been able to respond to your request.';
/** /**
* Show the contents of val in a debug-friendly way. * Show the contents of val in a debug-friendly way.
* Debug::show() is intended to be equivalent to dprintr() * Debug::show() is intended to be equivalent to dprintr()
@ -304,8 +314,8 @@ class Debug {
* @return string HTML error message for non-ajax requests, plaintext for ajax-request. * @return string HTML error message for non-ajax requests, plaintext for ajax-request.
*/ */
static function friendlyError($statusCode = 500, $friendlyErrorMessage = null, $friendlyErrorDetail = null) { static function friendlyError($statusCode = 500, $friendlyErrorMessage = null, $friendlyErrorDetail = null) {
if(!$friendlyErrorMessage) $friendlyErrorMessage = 'There has been an error'; if(!$friendlyErrorMessage) $friendlyErrorMessage = self::$friendly_error_header;
if(!$friendlyErrorDetail) $friendlyErrorDetail = 'The website server has not been able to respond to your request.'; if(!$friendlyErrorDetail) $friendlyErrorDetail = self::$friendly_error_detail;
if(!headers_sent()) header($_SERVER['SERVER_PROTOCOL'] . " $statusCode $friendlyErrorMessage"); if(!headers_sent()) header($_SERVER['SERVER_PROTOCOL'] . " $statusCode $friendlyErrorMessage");