Changeset 22144 for branches/version-2_12-multilang/data/class/helper

Timestamp:

2012/12/17 14:25:58 (14 years ago)

Author:

h_yoshimoto

Message:

#1955 r22123 ～ r22143 間のコミットをmerge

Location:

branches/version-2_12-multilang

Files:

• . (modified) (1 prop)
• data/class/helper/SC_Helper_HandleError.php (modified) (1 diff)

branches/version-2_12-multilang/data/class/helper/SC_Helper_HandleError.php

@@ -48 +48 @@
         error_reporting(E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_DEPRECATED & ~E_STRICT);
 
-        if (!defined('SAFE') || SAFE !== true || !defined('INSTALL_FUNCTION') || INSTALL_FUNCTION !== true) {
+        if (!(defined('SAFE') && SAFE === true) && !(defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true)) {
 
             // E_USER_ERROR または警告を捕捉した場合のエラーハンドラ