From 1a93719e3fda2c3330e3131c234ce64d3b325139 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 14 Nov 2022 09:18:19 +0100 Subject: [PATCH] When application.ini debug.enable is true, also debug js and css --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 3 ++- snappymail/v/0.0.0/app/libraries/RainLoop/Service.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 4c6dda119..5a7396251 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -872,7 +872,8 @@ class Actions ? './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/' : ''; - $bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false); + $bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false) + || $this->oConfig->Get('debug', 'enable', false); $aResult['StaticLibsJs'] = Utils::WebStaticPath('js/' . ($bAppJsDebug ? '' : 'min/') . 'libs' . ($bAppJsDebug ? '' : '.min') . '.js'); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php index a055009f1..602741f00 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php @@ -154,8 +154,9 @@ abstract class Service $sLanguage = $oActions->GetLanguage($bAdmin); - $sAppJsMin = $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min'; - $sAppCssMin = $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min'; + $bAppDebug = $oConfig->Get('debug', 'enable', false); + $sAppJsMin = $bAppDebug || $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min'; + $sAppCssMin = $bAppDebug || $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min'; $sFaviconUrl = (string) $oConfig->Get('webmail', 'favicon_url', '');