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

Merge pull request #866 from p-golovin/patch-1

Browse Source 
Remove substitution for not defined variables
This commit is contained in:
Jordi Boggiano
2016-11-13 20:15:08 +01:00
committed by GitHub
parent 2c1ed388c2 c3c0abf2a4
commit 79bf752d27
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,8 @@ class LineFormatter extends NormalizerFormatter
} }
} }
$output = preg_replace('/%extra\..+?%/', '', $output);
foreach ($vars['context'] as $var => $val) { foreach ($vars['context'] as $var => $val) {
if (false !== strpos($output, '%context.'.$var.'%')) { if (false !== strpos($output, '%context.'.$var.'%')) {
$output = str_replace('%context.'.$var.'%', $this->stringify($val), $output); $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
@@ -83,6 +85,8 @@ class LineFormatter extends NormalizerFormatter
} }
} }
$output = preg_replace('/%context\..+?%/', '', $output);
if ($this->ignoreEmptyContextAndExtra) { if ($this->ignoreEmptyContextAndExtra) {
if (empty($vars['context'])) { if (empty($vars['context'])) {
unset($vars['context']); unset($vars['context']);