Merge from 1.5.2.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-02 09:30:09 +00:00
parent 9bf08cf3df
commit 361cd64c16
86 changed files with 804 additions and 156 deletions

View file

@ -173,6 +173,14 @@
if(!$output->toBool()) return $output;
$output = executeQuery('module.insertModuleConfig', $args);
//remove from cache
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
{
$cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
$oCacheHandler->delete($cache_key);
}
return $output;
}

View file

@ -21,9 +21,9 @@
<tr>
<td class="nowr">
<!--@if(in_array($val->module,$favoriteModuleList))-->
<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
<button type="button" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</button>
<!--@else-->
<a href="#" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</a>
<button type="button" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</button>
<!--@end-->
</td>
<td class="title">