Index: /branches/version-2_12-dev/html/handle_error.php
===================================================================
--- /branches/version-2_12-dev/html/handle_error.php (revision 21420)
+++ /branches/version-2_12-dev/html/handle_error.php (revision 21429)
@@ -94,7 +94,9 @@
$now = date("Y/m/d H:i:s");
+ // 本来 realpath() で正規化したいところだが、NULL を返すケースがあるため避けている (#1618)
+ $log_file_path = dirname(__FILE__) . '/' . HTML2DATA_DIR . 'logs/site.log';
switch ($errno) {
case E_USER_ERROR:
- error_log($now . " [$errfile] FATAL Error($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log"));
+ error_log($now . " [$errfile] FATAL Error($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, $log_file_path);
displaySystemError($errstr);
@@ -104,5 +106,5 @@
case E_WARNING:
case E_USER_WARNING:
- error_log($now . " [$errfile] WARNING($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log"));
+ error_log($now . " [$errfile] WARNING($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, $log_file_path);
return true;
break;