merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -183,7 +183,7 @@
$args->module_srl = $module_srl;
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport()){
$cache_key = 'object:'.$module_srl;
$cache_key = 'object_module_info:'.$module_srl;
$output = $oCacheHandler->get($cache_key);
}
if(!$output){
@ -1566,8 +1566,9 @@
/**
* @brief already instance created module list
**/
function getModuleListByInstance($columnList = array())
function getModuleListByInstance($site_srl = 0, $columnList = array())
{
$args->site_srl = $site_srl;
$output = executeQueryArray('module.getModuleListByInstance', $args, $columnList);
return $output;
}