Skip to content

Commit d3be6ed

Browse files
committed
ENHANCEMENT Allowing string arguments in SS_Log::log()
1 parent 5284f90 commit d3be6ed

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

dev/Log.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,16 @@ public static function log($message, $priority) {
133133
'errline' => $message->getLine(),
134134
'errcontext' => $message->getTrace()
135135
);
136+
} elseif(is_string($message)) {
137+
$trace = SS_Backtrace::filtered_backtrace();
138+
$lastTrace = $trace[0];
139+
$message = array(
140+
'errno' => '',
141+
'errstr' => $message,
142+
'errfile' => @$lastTrace['file'],
143+
'errline' => @$lastTrace['line'],
144+
'errcontext' => $trace
145+
);
136146
}
137147
try {
138148
self::get_logger()->log($message, $priority);

dev/LogErrorEmailFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function format($event) {
4949
$data .= "</div>\n";
5050

5151
$relfile = Director::makeRelative($errfile);
52-
if($relfile[0] == '/') $relfile = substr($relfile, 1);
52+
if($relfile && $relfile[0] == '/') $relfile = substr($relfile, 1);
5353

5454
$host = @$_SERVER['HTTP_HOST'];
5555
$uri = @$_SERVER['REQUEST_URI'];

0 commit comments

Comments
 (0)