1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00

Merge branch '1.x'

This commit is contained in:
Jordi Boggiano
2017-03-13 08:08:24 +01:00
2 changed files with 6 additions and 1 deletions

View File

@@ -1,3 +1,8 @@
### 1.22.1 (2017-03-13)
* Fixed lots of minor issues in the new Slack integrations
* Fixed support for allowInlineLineBreaks in LineFormatter when formatting exception backtraces
### 1.22.0 (2016-11-26)
* Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily

View File

@@ -159,7 +159,7 @@ class LineFormatter extends NormalizerFormatter
{
if ($this->allowInlineLineBreaks) {
if (0 === strpos($str, '{')) {
return str_replace(['\r', '\n'], ["\r", "\n"], $str);
return str_replace(array('\r', '\n'), array("\r", "\n"), $str);
}
return $str;