From aaac1d45fc96a41b6ea15b992ba9dee435baaa76 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 16 Aug 2015 11:38:13 +0200 Subject: [PATCH] Separated this config entry for console/html as well. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/class_BaseFrameworkSystem.php | 2 +- .../main/output/debug/console/class_DebugConsoleOutput.php | 2 +- inc/config.php | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index e3d15848..26fa6fa2 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -1946,7 +1946,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } // END - if } else { // Are debug times enabled? - if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') { + if ($this->getConfigInstance()->getConfigEntry('debug_' . self::getResponseTypeFromSystem() . '_output_timings') == 'Y') { // Prepent it $message = $this->getPrintableExecutionTime() . $message; } // END - if diff --git a/inc/classes/main/output/debug/console/class_DebugConsoleOutput.php b/inc/classes/main/output/debug/console/class_DebugConsoleOutput.php index d7591598..3598cc18 100644 --- a/inc/classes/main/output/debug/console/class_DebugConsoleOutput.php +++ b/inc/classes/main/output/debug/console/class_DebugConsoleOutput.php @@ -63,7 +63,7 @@ class DebugConsoleOutput extends BaseDebugOutput implements Debugger, OutputStre } // Are debug times enabled? - if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') { + if ($this->getConfigInstance()->getConfigEntry('debug_' . self::getResponseTypeFromSystem() . '_output_timings') == 'Y') { // Output it first $output = $this->getPrintableExecutionTime() . $output; } // END - if diff --git a/inc/config.php b/inc/config.php index f7cd0c7f..f42bd1a3 100644 --- a/inc/config.php +++ b/inc/config.php @@ -341,8 +341,11 @@ $cfg->setConfigEntry('local_file_database_class', 'CachedLocalFileDatabase'); // CFG: COMPRESSOR-CHANNEL-CLASS $cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel'); -// CFG: DEBUG-OUTPUT-TIMINGS -$cfg->setConfigEntry('debug_output_timings', 'N'); +// CFG: DEBUG-HTML-OUTPUT-TIMINGS +$cfg->setConfigEntry('debug_html_output_timings', 'N'); + +// CFG: DEBUG-CONSOLE-OUTPUT-TIMINGS +$cfg->setConfigEntry('debug_console_output_timings', 'Y'); // CFG: PROXY-HOST $cfg->setConfigEntry('proxy_host', ''); -- 2.39.5