Changeset 20466 for branches/version-2_5-dev/data

Timestamp:

2011/03/02 20:12:36 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20465

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/pages/error/LC_Page_Error.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ferror%2FLC_Page_Error.php
data/class/pages/error/LC_Page_Error_SystemError.php 16931@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ferror%2FLC_Page_Error_SystemError.php
data/require_safe.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_safe.php
html/handle_error.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fhtml%2Fhandle_error.php
html/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Frequire.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3193

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/error/LC_Page_Error.php [email protected]
data/class/pages/error/LC_Page_Error_SystemError.php [email protected]
data/require_safe.php [email protected]
html/handle_error.php [email protected]
html/require.php [email protected]

bzr:timestamp:

2011-03-02 20:12:25.098000050 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-02T11:12:25.098000Z

Message:

#989(エラー発生時に, テンプレートの取得が正常にできない)

• DBエラー発生時に, エラー画面で DB 接続しないよう修正
• エラー画面へリダイレクトした場合でも, モバイルの絵文字を表示するよう修正

Location:

branches/version-2_5-dev/data

Files:

• class/pages/error/LC_Page_Error.php (modified) (1 diff)
• class/pages/error/LC_Page_Error_SystemError.php (modified) (4 diffs)
• require_safe.php (modified) (1 diff)

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

@@ -57 +57 @@
      * Page を初期化する.
      *
+     * DBエラー発生時, エラーページを表示しようした際の DB 接続を防ぐため,
+     * ここでは, parent::init() を行わない.
      * @return void
      */
     function init() {
-        parent::init();
         $this->tpl_mainpage = 'error.tpl';
         $this->tpl_title = 'エラー';
+        // ディスプレイクラス生成
+        $this->objDisplay = new SC_Display();
     }
 

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

@@ -34 +34 @@
  */
 class LC_Page_Error_SystemError extends LC_Page_Error {
-    
+
     /** PEAR_Error */
     var $pearResult;
-    
+
     /** PEAR_Error がセットされていない場合用のバックトレーススタック */
     var $backtrace;
@@ -53 +53 @@
      */
     function init() {
-        parent::init();
+        parent::init();
         $this->tpl_title = 'システムエラー';
     }
@@ -175 +175 @@
         return $errmsg;
     }
-    
+
     /**
      * エラーメッセージの冒頭部を生成する
@@ -188 +188 @@
         $errmsg .= "REMOTE_ADDR: " . $_SERVER['REMOTE_ADDR'] . "\n";
         $errmsg .= "USER_AGENT: " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        
+
         return $errmsg;
     }

branches/version-2_5-dev/data/require_safe.php

@@ -40 +40 @@
 // 各種クラス読み込み
 require_once(DATA_REALDIR . "require_classes.php");
+
+if (SC_Display::detectDevice() == DEVICE_TYPE_MOBILE) {
+    ob_start(array('SC_MobileEmoji', 'handler'));
+}
 ?>