mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 01:26:11 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-11-13 20:26:27 +01:00
parent 71c13b8c00 371b8ebb1b
commit 1dc4cf31e8
5 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ class LineFormatter extends NormalizerFormatter
}
}
foreach ($vars['context'] as $var => $val) {
if (false !== strpos($output, '%context.'.$var.'%')) {
$output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
@@ -101,6 +102,11 @@ class LineFormatter extends NormalizerFormatter
}
}
// remove leftover %extra.xxx% and %context.xxx% if any
if (false !== strpos($output, '%')) {
$output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
}
return $output;
}