From 8a04d3f9939757085eca76276dddddc064472c1d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 28 Dec 2018 09:54:38 +0100 Subject: [PATCH] Fix so performance stats are logged to the main console log also when per_user_logging=true --- CHANGELOG | 1 + program/include/rcmail.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 77539bb97..5f870e4f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ CHANGELOG Roundcube Webmail - Elastic: Fix unwanted thread expanding when selecting a collapsed thread in non-mobile mode (#6445) - Elastic: Add "status bar" for mobile in mail composer - Log errors caused by low pcre.backtrack_limit when sending a mail message (#6433) +- Fix so performance stats are logged to the main console log also when per_user_logging=true - Fix malformed message saved into Sent folder when using big attachments and low memory limit (#6498) - Fix incorrect IMAP SASL GSSAPI negotiation (#6308) - Fix so unicode in local part of the email address is also supported in recipient inputs (#6490) diff --git a/program/include/rcmail.php b/program/include/rcmail.php index c1c08e4c5..243ed9924 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -893,6 +893,9 @@ class rcmail extends rcube // write performance stats to logs/console if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) { + // we have to disable per_user_logging to make sure stats end up in the main console log + $this->config->set('per_user_logging', false); + // make sure logged numbers use unified format setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');