From 791c6e4869ddeee39ce6980d24082021d4f98a92 Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 25 Apr 2007 07:23:35 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1327 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/display/DisplayHandler.class.php | 12 +++---- classes/module/ModuleHandler.class.php | 2 +- modules/document/document.model.php | 44 +++++++++++++----------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 6467cada9..387dd14a8 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -66,18 +66,18 @@ $this->content_size = strlen($output); + // 디버깅 데이터 출력 + $this->_debugOutput(); + // 컨텐츠 출력 if(Context::getResponseMethod()!="XMLRPC") { - //ini_set('zlib.output_compression_level',3); - //ob_start('ob_gzhandler'); + ini_set('zlib.output_compression_level',3); + ob_start('ob_gzhandler'); print trim($output); - //ob_end_flush(); + ob_end_flush(); } else { print trim($output); } - - // 디버깅 데이터 출력 - $this->_debugOutput(); } /** diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 75387700a..af8d6ebde 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -65,7 +65,7 @@ $oModuleModel = &getModel('module'); // document_srl이 있으면 document_srl로 모듈과 모듈 정보를 구함 - if($this->document_srl) $module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl); + if($this->document_srl && !$this->mid) $module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl); if($this->module && $module_info->module != $this->module) unset($module_info); // 아직 모듈을 못 찾았고 $mid값이 있으면 $mid로 모듈을 구함 diff --git a/modules/document/document.model.php b/modules/document/document.model.php index bac1249bb..58fe20a04 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -248,30 +248,32 @@ $document_srl = $document->document_srl; - // 댓글 가져오기 - if($document->comment_count && $document->allow_comment == 'Y') { - $oCommentModel = &getModel('comment'); - $document->comment_list = $oCommentModel->getCommentList($document_srl, $is_admin); - } + if($get_extra_info) { + // 댓글 가져오기 + if($document->comment_count && $document->allow_comment == 'Y') { + $oCommentModel = &getModel('comment'); + $document->comment_list = $oCommentModel->getCommentList($document_srl, $is_admin); + } - // 트랙백 가져오기 - if($document->trackback_count && $document->allow_trackback == 'Y') { - $oTrackbackModel = &getModel('trackback'); - $document->trackback_list = $oTrackbackModel->getTrackbackList($document_srl, $is_admin); - } + // 트랙백 가져오기 + if($document->trackback_count && $document->allow_trackback == 'Y') { + $oTrackbackModel = &getModel('trackback'); + $document->trackback_list = $oTrackbackModel->getTrackbackList($document_srl, $is_admin); + } - // 첨부파일 가져오기 - if($document->uploaded_count) { - $oFileModel = &getModel('file'); - $file_list = $oFileModel->getFiles($document_srl, $is_admin); - $document->uploaded_list = $file_list; - } + // 첨부파일 가져오기 + if($document->uploaded_count) { + $oFileModel = &getModel('file'); + $file_list = $oFileModel->getFiles($document_srl, $is_admin); + $document->uploaded_list = $file_list; + } - // 태그 정리 - if($document->tags) { - $tag_list = explode(',',$document->tags); - $tag_count = count($tag_list); - for($i=0;$i<$tag_count;$i++) if(trim($tag_list[$i])) $document->tag_list[] = trim($tag_list[$i]); + // 태그 정리 + if($document->tags) { + $tag_list = explode(',',$document->tags); + $tag_count = count($tag_list); + for($i=0;$i<$tag_count;$i++) if(trim($tag_list[$i])) $document->tag_list[] = trim($tag_list[$i]); + } } $document->content = sprintf('%s', $document_srl, $document->member_srl, $document->content, $document_srl, $document->member_srl);