Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trimming comment bloat from Error class.

This commit is contained in:
Taylor Otwell 2011-07-06 14:13:57 -07:00
parent 014c2ebf66
commit fa0e6c8db1
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
system/error.php
View File

@ -31,24 +31,16 @@ class Error {
*/ */
public static function handle($e) public static function handle($e)
{ {
// ----------------------------------------------------- // Clean the output buffer. We don't want any rendered views or text sent to the browser.
// Clean the output buffer. We don't want any rendered
// views or text to be sent to the browser.
// -----------------------------------------------------
if (ob_get_level() > 0) if (ob_get_level() > 0)
{ {
ob_clean(); ob_clean();
} }
// -----------------------------------------------------
// Get the error severity in human readable format. // Get the error severity in human readable format.
// -----------------------------------------------------
$severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode(); $severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode();
// ----------------------------------------------------- // Get the error file. Views require special handling since view errors occur in eval'd code.
// Get the error file. Views require special handling
// since view errors occur within eval'd code.
// -----------------------------------------------------
if (strpos($e->getFile(), 'view.php') !== false and strpos($e->getFile(), "eval()'d code") !== false) if (strpos($e->getFile(), 'view.php') !== false and strpos($e->getFile(), "eval()'d code") !== false)
{ {
$file = APP_PATH.'views/'.View::$last.EXT; $file = APP_PATH.'views/'.View::$last.EXT;
@ -65,14 +57,6 @@ public static function handle($e)
Log::error($message.' in '.$e->getFile().' on line '.$e->getLine()); Log::error($message.' in '.$e->getFile().' on line '.$e->getLine());
} }
// -----------------------------------------------------
// Detailed error view contains the file name and stack
// trace of the error. It is not wise to have details
// enabled in a production environment.
//
// The generic error view (error/500) only has a simple,
// generic error message suitable for production.
// -----------------------------------------------------
if (Config::get('error.detail')) if (Config::get('error.detail'))
{ {
$view = View::make('exception') $view = View::make('exception')
@ -109,15 +93,11 @@ private static function context($path, $line, $padding = 5)
array_unshift($file, ''); array_unshift($file, '');
// -----------------------------------------------------
// Calculate the starting position of the file context. // Calculate the starting position of the file context.
// -----------------------------------------------------
$start = $line - $padding; $start = $line - $padding;
$start = ($start < 0) ? 0 : $start; $start = ($start < 0) ? 0 : $start;
// -----------------------------------------------------
// Calculate the context length. // Calculate the context length.
// -----------------------------------------------------
$length = ($line - $start) + $padding + 1; $length = ($line - $start) + $padding + 1;
$length = (($start + $length) > count($file) - 1) ? null : $length; $length = (($start + $length) > count($file) - 1) ? null : $length;