Changeset 21011 for branches/version-2_11-dev/html

Timestamp:

2011/07/04 13:40:13 (13 years ago)

Author:

Seasoft

Message:

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

Location:

branches/version-2_11-dev/html

Files:

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

branches/version-2_11-dev/html/error.php

@@ -22 +22 @@
  */
 // {{{ requires
-$require_php_dir = realpath(dirname( __FILE__));
-require_once $require_php_dir . '/define.php';
-require_once $require_php_dir . '/' . HTML2DATA_DIR . 'require_safe.php';
+define('SAFE', true);
+if (isset($_GET['admin'])) {
+    define('ADMIN_FUNCTION', true);
+}
+require_once './require.php';
 require_once CLASS_EX_REALDIR . 'page_extends/error/LC_Page_Error_SystemError_Ex.php';
 
-if (isset($_GET['admin'])) {
-    define("ADMIN_FUNCTION", true);
-}
 // }}}
 // {{{ generate page
 $objPage = new LC_Page_Error_SystemError_Ex();
-register_shutdown_function(array($objPage, "destroy"));
+register_shutdown_function(array($objPage, 'destroy'));
 $objPage->init();
 $objPage->process();

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

@@ -23 +23 @@
 
 // rtrim は PHP バージョン依存対策
-define("HTML_REALDIR", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
+define('HTML_REALDIR', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
+
+if (ADMIN_FUNCTION !== true) {
+    define('FRONT_FUNCTION', true);
+}
 
 require_once HTML_REALDIR . 'define.php';
-require_once HTML_REALDIR . 'handle_error.php';
-require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 
-if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE){
-    define('MOBILE_SITE', true);
+if (SAFE === true) {
+    require_once HTML_REALDIR . HTML2DATA_DIR . 'require_safe.php';
+} else {
+    require_once HTML_REALDIR . 'handle_error.php';
+    require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
+}
+
+if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
     $objMobile = new SC_Helper_Mobile_Ex();
     $objMobile->sfMobileInit();
     ob_start();
-
 } else {
-    define('FRONT_FUNCTION_PC_SITE', true);
-
     // 絵文字変換 (除去) フィルターを組み込む。
     ob_start(array('SC_MobileEmoji', 'handler'));
 }
-?>