Changeset 20259

Timestamp:

2011/02/20 18:23:10 (13 years ago)

Author:

shutta

Message:

refs #985
エラー画面表示の不具合を修正。

Location:

branches/version-2_5-dev/data/class/pages/error

Files:

• LC_Page_Error_DispError.php (modified) (3 diffs)
• LC_Page_Error_SystemError.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_DispError.php

@@ -24 +24 @@
 
 // {{{ requires
-require_once(CLASS_REALDIR . "pages/error/LC_Page_Error.php");
+require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php");
 
 /**
@@ -33 +33 @@
  * @version $Id$
  */
-class LC_Page_Error_DispError extends LC_Page_Error {
+class LC_Page_Error_DispError extends LC_Page_Admin {
 
     // }}}
@@ -45 +45 @@
     function init() {
         parent::init();
+        $this->template = LOGIN_FRAME;
         $this->tpl_mainpage = 'login_error.tpl';
         $this->tpl_title = 'ログインエラー';

branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php

@@ -73 +73 @@
      */
     function action(){
-        $this->adminPage = SC_Utils_Ex::sfIsAdminFunction();
-
-        if ($this->adminPage) {
-            $this->tpl_mainpage = 'login_error.tpl';
-            $this->frame = LOGIN_FRAME;
-        } else {
-            $this->frame = SITE_FRAME;
-        }
-        
-        $objView = null;
-        if (SC_Display::detectDevice() == DEVICE_TYPE_MOBILE && $this->adminPage == false) {
-            $objView = new SC_InstallView(MOBILE_TEMPLATE_REALDIR, MOBILE_COMPILE_REALDIR);
-        } elseif($this->adminPage) {
-            $objView = new SC_AdminView();
-        } else {
-            $objView = new SC_InstallView(TEMPLATE_REALDIR, COMPILE_REALDIR);
-        }
-
         $this->tpl_error = "システムエラーが発生しました。<br />大変お手数ですが、サイト管理者までご連絡ください。";
-
-        $objView->assignobj($this);
-        $objView->display($this->frame);
 
         if (DEBUG_MODE) {
@@ -106 +85 @@
         }
     }
+
+    /**
+     * Page のレスポンス送信.
+     *
+     * @return void
+     */
+    function sendResponse() {
+        $this->adminPage = SC_Utils_Ex::sfIsAdminFunction();
+
+        if ($this->adminPage) {
+            $this->tpl_mainpage = 'login_error.tpl';
+            $this->template = LOGIN_FRAME;
+            $this->objDisplay->prepare($this, true);
+        } else {
+            $this->objDisplay->prepare($this);
+        }
+
+        $this->objDisplay->response->write();
+    }
+
 
     /**