Commit 6a77a98f by Taylor Otwell

refactored error and file classes.

parent 4b063ac0
...@@ -31,7 +31,7 @@ class Error { ...@@ -31,7 +31,7 @@ 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 so no previously rendered views or text is sent to the browser.
if (ob_get_level() > 0) if (ob_get_level() > 0)
{ {
ob_clean(); ob_clean();
...@@ -40,7 +40,8 @@ class Error { ...@@ -40,7 +40,8 @@ class Error {
// 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 file in which the error occured.
// Views require special handling since view errors occur in 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;
...@@ -60,12 +61,12 @@ class Error { ...@@ -60,12 +61,12 @@ class Error {
if (Config::get('error.detail')) if (Config::get('error.detail'))
{ {
$view = View::make('exception') $view = View::make('exception')
->bind('severity', $severity) ->bind('severity', $severity)
->bind('message', $message) ->bind('message', $message)
->bind('file', $file) ->bind('file', $file)
->bind('line', $e->getLine()) ->bind('line', $e->getLine())
->bind('trace', $e->getTraceAsString()) ->bind('trace', $e->getTraceAsString())
->bind('contexts', static::context($file, $e->getLine())); ->bind('contexts', static::context($file, $e->getLine()));
Response::make($view, 500)->send(); Response::make($view, 500)->send();
} }
......
...@@ -125,11 +125,6 @@ class File { ...@@ -125,11 +125,6 @@ class File {
*/ */
public static function upload($key, $path) public static function upload($key, $path)
{ {
if ( ! array_key_exists($key, $_FILES)) return array_key_exists($key, $_FILES) ? move_uploaded_file($_FILES[$key]['tmp_name'], $path) : false;
{
return false;
}
return move_uploaded_file($_FILES[$key]['tmp_name'], $path);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment