Преглед изворни кода

Ticket #4544 - Add debug mode in header.inc.

AntonLV пре 2 година
родитељ
комит
b16e6a26f9
3 измењених фајлова са 7 додато и 6 уклоњено
  1. 3 3
      inc/classes/BxDolTemplate.php
  2. 2 1
      install/patterns/header.inc.php
  3. 2 2
      template/scripts/BxBasePage.php

+ 3 - 3
inc/classes/BxDolTemplate.php

@@ -285,7 +285,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         $this->addLocationJs('system_inc_js_classes', BX_DIRECTORY_PATH_INC . 'js/classes/' , BX_DOL_URL_ROOT . 'inc/js/classes/');
         $this->addLocationJs('system_plugins_public', BX_DIRECTORY_PATH_PLUGINS_PUBLIC, BX_DOL_URL_PLUGINS_PUBLIC);
 
-        $this->_bCacheEnable = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_enable') == 'on';
+        $this->_bCacheEnable = !bx_is_dbg() && !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_enable') == 'on';
         $this->_sCacheFolderUrl = '';
         $this->_sCachePublicFolderUrl = BX_DOL_URL_CACHE_PUBLIC;
         $this->_sCachePublicFolderPath = BX_DIRECTORY_PATH_CACHE_PUBLIC;
@@ -298,14 +298,14 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         $bArchive = getParam('sys_template_cache_compress_enable') == 'on';
 
         $this->_bCssLess = true; //--- Less cannot be disabled for CSS.
-        $this->_bCssCache = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_css_enable') == 'on';
+        $this->_bCssCache = !bx_is_dbg() && !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_css_enable') == 'on';
         $this->_bCssMinify = $this->_bCssCache && getParam('sys_template_cache_minify_css_enable') == 'on';
         $this->_bCssArchive = $this->_bCssCache && $bArchive;
         $this->_sCssLessPrefix = $this->_sCacheFilePrefix . 'less_';
         $this->_sCssCachePrefix = $this->_sCacheFilePrefix . 'css_';
 
         $this->_bJsLess = false; //--- Less language isn't available for JS at all.
-        $this->_bJsCache = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_js_enable') == 'on';
+        $this->_bJsCache = !bx_is_dbg() && !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_js_enable') == 'on';
         $this->_bJsMinify = $this->_bJsCache && getParam('sys_template_cache_minify_js_enable') == 'on';
         $this->_bJsArchive = $this->_bJsCache && $bArchive;
         $this->_sJsCachePrefix = $this->_sCacheFilePrefix . 'js_';

+ 2 - 1
install/patterns/header.inc.php

@@ -29,7 +29,8 @@ date_default_timezone_set('UTC');
 
 require_once('params.inc.php');
 
-bx_check_maintenance_mode (true);
+bx_check_debug_mode();
+bx_check_maintenance_mode(true);
 bx_check_minimal_requirements(true);
 bx_check_redirect_to_correct_hostname(true);
 bx_check_redirect_to_remove_install_folder(true);

+ 2 - 2
template/scripts/BxBasePage.php

@@ -204,7 +204,7 @@ class BxBasePage extends BxDolPage
             $this->_setSubmenu(array());
         }
 
-        if (!getParam('sys_page_cache_enable') || !$this->_aObject['cache_lifetime'] || (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST')) {
+        if (bx_is_dbg() || !getParam('sys_page_cache_enable') || !$this->_aObject['cache_lifetime'] || (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST')) {
             $sPageCode = $this->_getPageCode();
         }
         else {
@@ -652,7 +652,7 @@ class BxBasePage extends BxDolPage
 
     protected function _getBlockCodeWithCache(&$aBlock, $iAsync = 0)
     {
-        if (!getParam('sys_pb_cache_enable') || !$aBlock['cache_lifetime'] || $iAsync || (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST')) {
+        if (bx_is_dbg() || !getParam('sys_pb_cache_enable') || !$aBlock['cache_lifetime'] || $iAsync || (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST')) {
             $sBlockCode = $this->_getBlockCode($aBlock, $iAsync);
         }
         else {