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

@ -237,13 +237,13 @@
* @brief when menu add in sitemap, select module list
* this menu showing with trigger
**/
function getModuleListInSitemap()
function getModuleListInSitemap($site_srl = 0)
{
$oModuleModel = &getModel('module');
$columnList = array('module');
$moduleList = array('page');
$output = $oModuleModel->getModuleListByInstance($columnList);
$output = $oModuleModel->getModuleListByInstance($site_srl, $columnList);
if(is_array($output->data))
{
foreach($output->data AS $key=>$value)