mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 21:26:43 +02:00
Code Issues Releases Wiki Activity

Backport fix for #752, fixes #925

Browse Source
This commit is contained in:
Jordi Boggiano
2017-03-12 17:42:52 +01:00
parent e6b05c9173
commit 821cc3e4a5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Formatter/LineFormatter.php
View File

@@ -141,7 +141,7 @@ class LineFormatter extends NormalizerFormatter
$str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')'; $str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')';
if ($this->includeStacktraces) { if ($this->includeStacktraces) {
$str .= "\n[stacktrace]\n".$e->getTraceAsString(); $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n";
} }
return $str; return $str;
@@ -167,6 +167,10 @@ class LineFormatter extends NormalizerFormatter
protected function replaceNewlines($str) protected function replaceNewlines($str)
{ {
if ($this->allowInlineLineBreaks) { if ($this->allowInlineLineBreaks) {
if (0 === strpos($str, '{')) {
return str_replace(['\r', '\n'], ["\r", "\n"], $str);
}
return $str; return $str;
} }