php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-08 08:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14341: Fixed regression in error handling introduced by fixing #14264

Browse Source
This commit is contained in:
Alexander Makarov
2017-06-24 02:28:54 +03:00
committed by GitHub
parent 165421dfc7
commit d1d60e2d19
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -16,6 +16,7 @@ Yii Framework 2 Change Log
- Enh #14081: Added `yii\caching\CacheInterface` to make custom cache extensions adoption easier (silverfire) - Enh #14081: Added `yii\caching\CacheInterface` to make custom cache extensions adoption easier (silverfire)
- Chg #14286: Used primary inputmask package name instead of an alias (samdark) - Chg #14286: Used primary inputmask package name instead of an alias (samdark)
- Enh #14298: The default response formatter configs defined by `yii\web\Response::defaultFormatters()` now use the array syntax (brandonkelly) - Enh #14298: The default response formatter configs defined by `yii\web\Response::defaultFormatters()` now use the array syntax (brandonkelly)
- Bug #14341: Fixed regression in error handling introduced by fixing #14264 (samdark)
2.0.12 June 05, 2017 2.0.12 June 05, 2017
-------------------- --------------------

2
framework/log/Logger.php
View File

@ -278,7 +278,7 @@ class Logger extends Component
list($token, $level, $category, $timestamp, $traces) = $log; list($token, $level, $category, $timestamp, $traces) = $log;
$memory = isset($log[5]) ? $log[5] : 0; $memory = isset($log[5]) ? $log[5] : 0;
$log[6] = $i; $log[6] = $i;
$hash = md5(serialize($token)); $hash = md5(json_encode($token));
if ($level == self::LEVEL_PROFILE_BEGIN) { if ($level == self::LEVEL_PROFILE_BEGIN) {
$stack[$hash] = $log; $stack[$hash] = $log;
} elseif ($level == self::LEVEL_PROFILE_END) { } elseif ($level == self::LEVEL_PROFILE_END) {