merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -234,12 +234,26 @@
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$content = $module_info->content;
$cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType());
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
// widget controller re-run of the cache files
$oWidgetController = &getController('widget');
$oWidgetController->recompileWidget($content);
if($module_info->page_type == 'WIDGET')
{
$cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$mcacheFile = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType(), Context::getSslStatus());
}
else if($module_info->page_type == 'OUTSIDE')
{
$cache_file = sprintf("%sfiles/cache/opage/%d.cache.php", _XE_PATH_, $module_info->module_srl);
if($module_info->mpath)
{
$mcacheFile = sprintf("%sfiles/cache/opage/%d.m.cache.php", _XE_PATH_, $module_info->module_srl);
}
}
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
if(file_exists($mcacheFile)) FileHandler::removeFile($mcacheFile);
}
function procPageAdminArticleDocumentInsert()