issue 716, component configuration error when not checked all

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9766 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-10-27 01:46:08 +00:00
parent 22e2949578
commit 1c08f47cab

View file

@ -20,6 +20,10 @@
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$enables = Context::get('enables'); $enables = Context::get('enables');
$component_names = Context::get('component_names'); $component_names = Context::get('component_names');
if(!is_array($component_names)) $component_names = array();
if(!is_array($enables)) $enables = array();
$unables = array_diff($component_names, $enables); $unables = array_diff($component_names, $enables);
$componentList = array(); $componentList = array();
@ -30,10 +34,10 @@
$componentList[$component_name] = 'N'; $componentList[$component_name] = 'N';
} }
$output = $this->editorCheckUse($componentList,$site_module_info->site_srl); $output = $this->editorListOrder($component_names,$site_module_info->site_srl);
if(!$output->toBool()) return new Object(); if(!$output->toBool()) return new Object();
$output = $this->editorListOrder($component_names,$site_module_info->site_srl); $output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
if(!$output->toBool()) return new Object(); if(!$output->toBool()) return new Object();
$oEditorController = &getController('editor'); $oEditorController = &getController('editor');