Index: branches/5.2.x/core/kernel/utility/logger.php =================================================================== diff -u -N -r16435 -r16460 --- branches/5.2.x/core/kernel/utility/logger.php (.../logger.php) (revision 16435) +++ branches/5.2.x/core/kernel/utility/logger.php (.../logger.php) (revision 16460) @@ -1,6 +1,6 @@ 'logger.php', + 'kErrorHandlerStack' => 'logger.php', + 'kExceptionHandlerStack' => 'logger.php', + 'kDBConnection' => 'db_connection.php', + 'kDBConnectionDebug' => 'db_connection.php', + 'kDBLoadBalancer' => 'db_load_balancer.php', + ); /** * Create event log @@ -581,11 +587,14 @@ } if ( isset($files) && is_array($files) ) { - while (true) { + $classes = array_keys($files); + + while ( true ) { $trace_info = $trace[0]; $file = isset($trace_info['file']) ? basename($trace_info['file']) : ''; + $class = isset($trace_info['class']) ? $trace_info['class'] : ''; - if ( !in_array($file, $files) ) { + if ( ($file && !in_array($file, $files)) || ($class && !in_array($class, $classes)) ) { break; }