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

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/html

Files:

• handle_error.php (modified) (1 diff)
• require.php (modified) (1 diff)

branches/version-2_5-dev/html/handle_error.php

@@ -95 +95 @@
  */
 function displaySystemError($errstr = null) {
-    if (SC_Utils_Ex::sfIsMobileSite()) {
+    if (SC_Display::detectDevice() == DEVICE_TYPE_MOBILE) {
         ob_clean();
+        ob_start(array('SC_MobileEmoji', 'handler'));
     } else {
         // 最下層以外の出力用バッファをクリアし、出力のバッファリングを解除する

branches/version-2_5-dev/html/require.php

@@ -29 +29 @@
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 
-if ( Net_UserAgent_Mobile::isMobile() === true ){
-    define('MOBILE_SITE', true);
+if (SC_Display::detectDevice() == DEVICE_TYPE_MOBILE){
+    define('MOBILE_SITE', true);
     $objMobile = new SC_Helper_Mobile_Ex();
     $objMobile->sfMobileInit();
     ob_start();
-    
+
 } else {
-    define('FRONT_FUNCTION_PC_SITE', true); 
-    
-    // 絵文字変換 (除去) フィルターを組み込む。
-    ob_start(array('SC_MobileEmoji', 'handler'));
+    define('FRONT_FUNCTION_PC_SITE', true);
+
+    // 絵文字変換 (除去) フィルターを組み込む。
+    ob_start(array('SC_MobileEmoji', 'handler'));
 }
 ?>