When application.ini debug.enable is true, also debug js and css

This commit is contained in:
the-djmaze 2022-11-14 09:18:19 +01:00
parent 089f016633
commit 1a93719e3f
2 changed files with 5 additions and 3 deletions

View file

@ -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');

View file

@ -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', '');