[Svn-src-all:1369] [version-2_5-dev 20259] refs #985

[shutta]

Subversion committed to /home/svn/open 20259
http://svn.ec-cube.net/open_trac/changeset/20259
┌────────────────────────────┐
│更新者　:  shutta                                       │
│更新日時:  2011-02-20 18:23:10 +0900 (日, 20  2月 2011)│
└────────────────────────────┘

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


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_DispError.php
U   branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php

変更: branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_DispError.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_DispError.php	2011-02-20 08:58:41 UTC (rev 20258)
+++ branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_DispError.php	2011-02-20 09:23:10 UTC (rev 20259)
@@ -23,7 +23,7 @@
  */
 
 // {{{ requires
-require_once(CLASS_REALDIR . "pages/error/LC_Page_Error.php");
+require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php");
 
 /**
  * エラー表示のページクラス
@@ -32,7 +32,7 @@
  * @author LOCKON CO.,LTD.
  * @version $Id$
  */
-class LC_Page_Error_DispError extends LC_Page_Error {
+class LC_Page_Error_DispError extends LC_Page_Admin {
 
     // }}}
     // {{{ functions
@@ -44,6 +44,7 @@
      */
     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
===================================================================
--- branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php	2011-02-20 08:58:41 UTC (rev 20258)
+++ branches/version-2_5-dev/data/class/pages/error/LC_Page_Error_SystemError.php	2011-02-20 09:23:10 UTC (rev 20259)
@@ -72,29 +72,8 @@
      * @return void
      */
     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) {
             echo '<div class="debug">';
             echo '<div>▼▼▼ デバッグ情報ここから ▼▼▼</div>';
@@ -107,6 +86,26 @@
     }
 
     /**
+     * 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();
+    }
+
+
+    /**
      * デストラクタ.
      *
      * @return void