Changeset 21011


Ignore:
Timestamp:
2011/07/04 13:40:13 (10 years ago)
Author:
Seasoft
Message:

r21010 /html/ 配下コミット漏れ

Location:
branches/version-2_11-dev/html
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/html/error.php

    r20764 r21011  
    2222 */ 
    2323// {{{ requires 
    24 $require_php_dir = realpath(dirname( __FILE__)); 
    25 require_once $require_php_dir . '/define.php'; 
    26 require_once $require_php_dir . '/' . HTML2DATA_DIR . 'require_safe.php'; 
     24define('SAFE', true); 
     25if (isset($_GET['admin'])) { 
     26    define('ADMIN_FUNCTION', true); 
     27} 
     28require_once './require.php'; 
    2729require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php'; 
    2830 
    29 if (isset($_GET['admin'])) { 
    30     define("ADMIN_FUNCTION", true); 
    31 } 
    3231// }}} 
    3332// {{{ generate page 
    3433$objPage = new LC_Page_Error_SystemError_Ex(); 
    35 register_shutdown_function(array($objPage, "destroy")); 
     34register_shutdown_function(array($objPage, 'destroy')); 
    3635$objPage->init(); 
    3736$objPage->process(); 
  • branches/version-2_11-dev/html/require.php

    r20764 r21011  
    2323 
    2424// rtrim は PHP バージョン依存対策 
    25 define("HTML_REALDIR", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/'); 
     25define('HTML_REALDIR', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/'); 
     26 
     27if (ADMIN_FUNCTION !== true) { 
     28    define('FRONT_FUNCTION', true); 
     29} 
    2630 
    2731require_once HTML_REALDIR . 'define.php'; 
    28 require_once HTML_REALDIR . 'handle_error.php'; 
    29 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
    3032 
    31 if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE){ 
    32     define('MOBILE_SITE', true); 
     33if (SAFE === true) { 
     34    require_once HTML_REALDIR . HTML2DATA_DIR . 'require_safe.php'; 
     35} else { 
     36    require_once HTML_REALDIR . 'handle_error.php'; 
     37    require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
     38} 
     39 
     40if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { 
    3341    $objMobile = new SC_Helper_Mobile_Ex(); 
    3442    $objMobile->sfMobileInit(); 
    3543    ob_start(); 
    36  
    3744} else { 
    38     define('FRONT_FUNCTION_PC_SITE', true); 
    39  
    4045    // 絵文字変換 (除去) フィルターを組み込む。 
    4146    ob_start(array('SC_MobileEmoji', 'handler')); 
    4247} 
    43 ?> 
Note: See TracChangeset for help on using the changeset viewer.