From cc370fa98ee921d683afe37d3f002eb99bbafe3c Mon Sep 17 00:00:00 2001
From: pzinovkin <pzinovkin@4cb57b5f-5bbd-dd11-951b-001d605cbbc5>
Date: Thu, 22 Jan 2009 15:07:34 +0000
Subject: [PATCH] database errors handling

git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/trunk@51 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
---
 classes/MJException.class.php    |  2 +-
 classes/PageController.class.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/classes/MJException.class.php b/classes/MJException.class.php
index 8735261..4964b4f 100644
--- a/classes/MJException.class.php
+++ b/classes/MJException.class.php
@@ -17,7 +17,7 @@ class MJException extends Exception
     public function terminate()
     {
         if (!DEBUG_ENABLE) {
-            return "Sorry, server temporary unavaible";
+            throw new StaticPageException(500);
         }
 
         $return = "<b>MJ Error:</b> ";
diff --git a/classes/PageController.class.php b/classes/PageController.class.php
index 2a53901..3784bac 100644
--- a/classes/PageController.class.php
+++ b/classes/PageController.class.php
@@ -20,12 +20,14 @@ final class PageController
     public function display()
     {
         try {
-            $this->route = Load::router()->proccess(MJ_PATH);
-            $action = new $this->route->action;
-            $decorator = new $this->route->decorator;
-            return $decorator->display($action);
-        } catch (MJException $e) {
-            return $e->terminate();
+            try{
+                $this->route = Load::router()->proccess(MJ_PATH);
+                $action = new $this->route->action;
+                $decorator = new $this->route->decorator;
+                return $decorator->display($action);
+            } catch (MJException $e) {
+                return $e->terminate();
+            }
         } catch (DynamicPageException $e) {
             $decorator_name = DEFAULT_DECORATOR;
             $decorator = new $decorator_name;