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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2017-03-13 08:08:24 +01:00
parent 4f0c07af69 1e044bc4b3
commit f3dda67c09
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
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) ### 1.22.0 (2016-11-26)
* Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily * Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily

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

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