Ignore:
Timestamp:
2011/03/02 20:12:36 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20465
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
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:

ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110302111225-7nt684mmays9jmmw
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 ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
data/class/pages/error/LC_Page_Error_SystemError.php ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
data/require_safe.php ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
html/handle_error.php ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
html/require.php ohkouchi@loop-az.jp-20110302110932-1tk20i7opk0f9399
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 接続しないよう修正
  • エラー画面へリダイレクトした場合でも, モバイルの絵文字を表示するよう修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/html/require.php

    r19820 r20466  
    2929require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
    3030 
    31 if ( Net_UserAgent_Mobile::isMobile() === true ){ 
    32     define('MOBILE_SITE', true); 
     31if (SC_Display::detectDevice() == DEVICE_TYPE_MOBILE){ 
     32    define('MOBILE_SITE', true); 
    3333    $objMobile = new SC_Helper_Mobile_Ex(); 
    3434    $objMobile->sfMobileInit(); 
    3535    ob_start(); 
    36      
     36 
    3737} else { 
    38     define('FRONT_FUNCTION_PC_SITE', true);  
    39      
    40     // 絵文字変換 (除去) フィルターを組み込む。 
    41     ob_start(array('SC_MobileEmoji', 'handler')); 
     38    define('FRONT_FUNCTION_PC_SITE', true); 
     39 
     40    // 絵文字変換 (除去) フィルターを組み込む。 
     41    ob_start(array('SC_MobileEmoji', 'handler')); 
    4242} 
    4343?> 
Note: See TracChangeset for help on using the changeset viewer.