diff --git a/app/FrontController.php b/app/FrontController.php index 6ca28c7..5df27de 100644 --- a/app/FrontController.php +++ b/app/FrontController.php @@ -108,7 +108,7 @@ class FrontController { try { - //try { + try { $request = Env::getRequestUri(); $route = $this->getRouter()->route($request); if (!$route) { @@ -120,21 +120,15 @@ class FrontController $layout_class = $route->getLayout(); $layout = new $layout_class(); return $layout->fetch($action); - //} catch (GeneralException $e) { - // throw $e; - //} /*catch (Exception $e) { + } catch (GeneralException $e) { + throw $e; + } catch (Exception $e) { throw new GeneralException($e->getMessage(), $e->getCode()); - //} */ + } } catch (Exception $e) { - var_dump($e); - die('111'); - - /*if (DEBUG == true) { + if (DEBUG == true) { return $e->toHtml(); - } else { - $layout = new ErrorLayout(); - return $layout->fetch($e->getCode()); - } */ + } } } } \ No newline at end of file