D261.id.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/utility/logger.php
	===================================================================
	--- branches/5.2.x/core/kernel/utility/logger.php
	+++ branches/5.2.x/core/kernel/utility/logger.php
	@@ -198,12 +198,18 @@
	protected $_debugMode = false;

	/**
	- * Ignores backtrace record where following files are mentioned
	+ * Ignores backtrace record where following classes/files are mentioned
	*
	- * @var Array
	- * @access protected
	+ * @var array
	*/
	- protected $_ignoreInTrace = Array ('logger.php', 'db_connection.php', 'db_load_balancer.php');
	+ protected $_ignoreInTrace = array(
	+ 'kLogger' => '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;
	}