summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2017-03-13 08:08:24 +0100
committerJordi Boggiano <j.boggiano@seld.be>2017-03-13 08:08:24 +0100
commitf3dda67c09c1dc45e9196206ebf42b5bbc0e6332 (patch)
tree2630fbdad6da02c871ca4c6daadf461f17892278 /src
parent4f0c07af6984d1be6c764d446747bd2814f259bd (diff)
parent1e044bc4b34e91743943479f1be7a1d5eb93add0 (diff)
downloadmonolog-f3dda67c09c1dc45e9196206ebf42b5bbc0e6332.zip
monolog-f3dda67c09c1dc45e9196206ebf42b5bbc0e6332.tar.gz
monolog-f3dda67c09c1dc45e9196206ebf42b5bbc0e6332.tar.bz2
Merge branch '1.x'
Diffstat (limited to 'src')
-rw-r--r--src/Monolog/Formatter/LineFormatter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php
index 254a618..07f9767 100644
--- a/src/Monolog/Formatter/LineFormatter.php
+++ b/src/Monolog/Formatter/LineFormatter.php
@@ -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;