Changeset 12363

Timestamp:

08/25/09 23:45:22 (2 years ago)

Author:

Anton Lesnikov

Message:

Ticket #1026

Location:

trunk

Files:

• inc/classes/BxDolTemplate.php (modified) (2 diffs)
• periodic/cron.php (modified) (1 diff)

trunk/inc/classes/BxDolTemplate.php

@@ -198 +198 @@
         $this->addLocationJs('system_plugins_tinymce', BX_DIRECTORY_PATH_PLUGINS . 'tiny_mce/' , BX_DOL_URL_PLUGINS . 'tiny_mce/');
 
-        $this->_bCacheEnable = getParam('sys_template_cache_enable') == 'on';
+        $this->_bCacheEnable = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_enable') == 'on';
         $this->_sCacheFolderUrl = '';
         $this->_sCacheFolderPath = BX_DIRECTORY_PATH_CACHE;
@@ -208 +208 @@
         $this->_iImagesMaxSize = (int)getParam('sys_template_cache_image_max_size') * 1024;
 
-        $this->_bCssCache = getParam('sys_template_cache_css_enable') == 'on';
+        $this->_bCssCache = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_css_enable') == 'on';
         $this->_bCssArchive = $this->_bCssCache && false;
         $this->_sCssCachePrefix = $this->_sCacheFilePrefix . 'css_';
 
-        $this->_bJsCache = getParam('sys_template_cache_js_enable') == 'on';
+        $this->_bJsCache = !defined('BX_DOL_CRON_EXECUTE') && getParam('sys_template_cache_js_enable') == 'on';
         $this->_bJsArchive = $this->_bJsCache && false;
         $this->_sJsCachePrefix = $this->_sCacheFilePrefix . 'js_';

trunk/periodic/cron.php

@@ -26 +26 @@
 require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolDb.php');
 
+define('BX_DOL_CRON_EXECUTE', '1');
+
 /*
  * This file is used for cron jobs. He is started system cron every minute.