diff options
author | Jordi Boggiano <j.boggiano@seld.be> | 2016-09-25 18:22:52 +0200 |
---|---|---|
committer | Jordi Boggiano <j.boggiano@seld.be> | 2016-09-25 18:22:52 +0200 |
commit | bb61bfbe3b7ec6fb9347f2b12e987a5b0094998d (patch) | |
tree | 4a4ed8795224c6648f2bb3ba51306c9f60ccd2b7 /src | |
parent | 96f4fd718f8a547f5c5eeadf06383f097f4e3c08 (diff) | |
download | monolog-bb61bfbe3b7ec6fb9347f2b12e987a5b0094998d.zip monolog-bb61bfbe3b7ec6fb9347f2b12e987a5b0094998d.tar.gz monolog-bb61bfbe3b7ec6fb9347f2b12e987a5b0094998d.tar.bz2 |
When newlines are allowed in LineFormatter, unpack json_encoded blobs containing newlines into multiline strings, fixes #752
Diffstat (limited to 'src')
-rw-r--r-- | src/Monolog/Formatter/LineFormatter.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php index 5a65b4c..3cce7f7 100644 --- a/src/Monolog/Formatter/LineFormatter.php +++ b/src/Monolog/Formatter/LineFormatter.php @@ -130,7 +130,7 @@ class LineFormatter extends NormalizerFormatter $str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')'; if ($this->includeStacktraces) { - $str .= "\n[stacktrace]\n".$e->getTraceAsString(); + $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n"; } return $str; @@ -152,6 +152,10 @@ class LineFormatter extends NormalizerFormatter protected function replaceNewlines($str) { if ($this->allowInlineLineBreaks) { + if (0 === strpos($str, '{')) { + return str_replace(['\r', '\n'], ["\r", "\n"], $str); + } + return $str; } |