mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-05 09:41:40 +09:00
#18865106 : fixed the bug that disabled editor component is not shown in the list
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7418 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
4cc51d70da
commit
c33c3fad61
2 changed files with 4 additions and 3 deletions
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
// 컴포넌트의 종류를 구해옴
|
||||
$oEditorModel = &getModel('editor');
|
||||
$component_list = $oEditorModel->getComponentList(false, $site_srl);
|
||||
$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
|
||||
|
||||
Context::set('component_list', $component_list);
|
||||
|
||||
|
|
|
|||
|
|
@ -555,9 +555,9 @@
|
|||
/**
|
||||
* @brief component 목록을 return (DB정보 보함)
|
||||
**/
|
||||
function getComponentList($filter_enabled = true, $site_srl=0) {
|
||||
function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false) {
|
||||
$cache_file = $this->getCacheFile(false, $site_srl);
|
||||
if(!file_exists($cache_file)) {
|
||||
if($from_db || !file_exists($cache_file)) {
|
||||
$oEditorController = &getController('editor');
|
||||
$oEditorController->makeCache(false, $site_srl);
|
||||
}
|
||||
|
|
@ -581,6 +581,7 @@
|
|||
FileHandler::removeFile($cache_file);
|
||||
return $this->getComponentList($filter_enabled, $site_srl);
|
||||
}
|
||||
if(!$filter_enabled) continue;
|
||||
if($val->enabled == "N") {
|
||||
unset($component_list->{$key});
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue