From 7bcdedb97ac0c05e48ec906d9e9b47ecb10493b4 Mon Sep 17 00:00:00 2001 From: k10206 Date: Thu, 11 Oct 2007 14:08:58 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=8A=A4=ED=82=A8?= =?UTF-8?q?=EC=97=90=EC=84=9C=20new=20=ED=91=9C=EC=8B=9C=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EA=B2=80=EC=82=AC=EC=A4=84=EC=97=90=20(int)=20?= =?UTF-8?q?=EC=82=BD=EC=9E=85=ED=95=A8.=20(is=5Fint()=EA=B0=80=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=84=A4=EC=9A=94...;;;)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2744 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_gallery/header.html | 2 +- modules/board/skins/xe_list/header.html | 2 +- modules/board/skins/xe_webzine/header.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/board/skins/xe_gallery/header.html b/modules/board/skins/xe_gallery/header.html index 17d3a5dca..e442b748b 100644 --- a/modules/board/skins/xe_gallery/header.html +++ b/modules/board/skins/xe_gallery/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } diff --git a/modules/board/skins/xe_list/header.html b/modules/board/skins/xe_list/header.html index 5e1bda72e..d3abc710f 100644 --- a/modules/board/skins/xe_list/header.html +++ b/modules/board/skins/xe_list/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } diff --git a/modules/board/skins/xe_webzine/header.html b/modules/board/skins/xe_webzine/header.html index 268e27c2a..ad23fa71f 100644 --- a/modules/board/skins/xe_webzine/header.html +++ b/modules/board/skins/xe_webzine/header.html @@ -16,7 +16,7 @@ - + {@ $module_info->duration_new = 12 } From 4b64a4bec22715623dbaf81faee721c843e17f2e Mon Sep 17 00:00:00 2001 From: bnu Date: Thu, 11 Oct 2007 16:40:06 +0000 Subject: [PATCH 02/11] =?UTF-8?q?#223=20=EC=9B=B9=EC=A7=84=ED=98=95=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EA=B9=A8=EC=A7=90=ED=98=84=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2745 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_webzine/list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html index 6f3311deb..8f8e138e4 100644 --- a/modules/board/skins/xe_webzine/list.html +++ b/modules/board/skins/xe_webzine/list.html @@ -141,9 +141,9 @@ {zdate($document->get('last_update'),'Y-m-d H:i')} - {@ $_col_count = 7} + {@ $_col_count = 6} - {@ $_col_count = 8} + {@ $_col_count = 7} {@ $_col_count --; } From 27fb2efd26ae86202d9125d4f94e585c603b6416 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 01:13:11 +0000 Subject: [PATCH 03/11] =?UTF-8?q?#223=20=EC=9B=B9=EC=A7=84=ED=98=95=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=EC=9D=B4=20=EA=B9=A8=EC=96=B4=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=EA=B2=83=EC=9D=80=20display=5Fno=EC=9D=98=20=EA=B0=92=EC=9D=B4?= =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=98=EA=B2=8C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=EB=90=9C=20=EB=B6=80=EB=B6=84=EC=9D=B4=EB=9D=BC=20?= =?UTF-8?q?=EC=9D=B4=20=EB=B6=80=EB=B6=84=20=EC=9E=AC=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=ED=95=98=EC=98=80=EC=8A=B5=EB=8B=88=EB=8B=A4.=20=EA=B7=B8?= =?UTF-8?q?=EB=A6=AC=EA=B3=A0=20=EB=8C=93=EA=B8=80=EB=93=A4=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=9D=B4=EB=A6=84=EC=9D=B4=EB=82=98=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=EC=98=86=EC=97=90=20=EC=A0=90=EC=9D=B4=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=EB=90=98=EB=8A=94=20li=20style=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=EB=8F=84=20=EC=88=98=EC=A0=95=ED=95=98=EC=98=80=EC=8A=B5?= =?UTF-8?q?=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2746 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_gallery/css/common.css | 5 +++-- modules/board/skins/xe_list/css/common.css | 5 +++-- modules/board/skins/xe_webzine/css/common.css | 7 ++++--- modules/board/skins/xe_webzine/list.html | 21 +++++++++---------- .../document/document.admin.controller.php | 1 + 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css index 80a592e2f..ecf8347b9 100644 --- a/modules/board/skins/xe_gallery/css/common.css +++ b/modules/board/skins/xe_gallery/css/common.css @@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;} #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; } +#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none; } #reply p { display:inline; margin-bottom:1em;} #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -200,7 +200,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css index 521575f3a..124ae6ee2 100644 --- a/modules/board/skins/xe_list/css/common.css +++ b/modules/board/skins/xe_list/css/common.css @@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;} #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; } +#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;} #reply p { display:inline; margin-bottom:1em;} #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -200,7 +200,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css index 57fc2a75e..d86931918 100644 --- a/modules/board/skins/xe_webzine/css/common.css +++ b/modules/board/skins/xe_webzine/css/common.css @@ -59,7 +59,7 @@ Jeong, Chan Myeong 070601~070630 .boardList tr.notice td.notice { font-size:.9em; color:#999999; font-weight:bold; text-align:center;} .boardList td.thumb { padding:8px; width:145px; table-layout:fixed; white-space:nowrap;} .boardList td.thumb * { vertical-align:middle;} -.boardList td.title {padding-left:1em; height:1em; border-bottom:none;} +.boardList td.title {padding-left:1em; height:1em; } .boardList td.title strong.category { font-size:1em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 3px; padding-right:.5em; margin-right:.5em;} .boardList td.title.bold { font-size:1.2em; font-weight:bold;} .boardList td.title.bold a { position:relative; top:.3em;} @@ -194,7 +194,7 @@ Jeong, Chan Myeong 070601~070630 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;} #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; } +#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none; } #reply p { display:inline; margin-bottom:1em;} #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; } @@ -205,7 +205,8 @@ Jeong, Chan Myeong 070601~070630 #reply .replyContent { clear:left; } #reply .replyContent p { display:block; } -#reply .replyContent li { padding:0; border:none; line-height:1.25em; } +#reply .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +#reply .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} #reply .reply { background-color:#FAFAFA;} #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html index 8f8e138e4..004a4220f 100644 --- a/modules/board/skins/xe_webzine/list.html +++ b/modules/board/skins/xe_webzine/list.html @@ -16,9 +16,9 @@ - - - + + + @@ -141,17 +141,16 @@ {zdate($document->get('last_update'),'Y-m-d H:i')} - {@ $_col_count = 6} + {@ $_col_count = 1} - {@ $_col_count = 7} + {@ $_col_count = 2} - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } - {@ $_col_count --; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } + {@ $_col_count ++; } {$document->getSummary(120)}  diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index 853399e66..eef0babab 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -209,6 +209,7 @@ $obj = null; $obj = $oDocument->getObjectVars(); + $obj->module_srl = $module_srl; $obj->document_srl = getNextSequence(); $obj->category_srl = $category_srl; $obj->password_is_hashed = true; From 05a1a791d859f0af04c4e021f5d1e3a4576623a5 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 01:18:13 +0000 Subject: [PATCH 04/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=EC=9D=98=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99/=EB=B3=B5=EC=82=AC=EC=8B=9C=EC=97=90=20?= =?UTF-8?q?=EA=B8=80=EC=9D=98=20=EC=88=9C=EC=84=9C=EA=B0=80=20=EC=9C=A0?= =?UTF-8?q?=EC=A7=80=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2747 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.admin.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index eef0babab..e67204922 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -135,7 +135,7 @@ $oDB = &DB::getInstance(); $oDB->begin(); - for($i=0;$i=0;$i--) { $document_srl = $document_srl_list[$i]; $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists()) continue; @@ -202,7 +202,7 @@ $oDB = &DB::getInstance(); $oDB->begin(); - for($i=0;$i=0;$i--) { $document_srl = $document_srl_list[$i]; $oDocument = $oDocumentModel->getDocument($document_srl); if(!$oDocument->isExists()) continue; From 8f61b62e59906fefc900b268ee709e7f5cee224a Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 01:19:54 +0000 Subject: [PATCH 05/11] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=ED=98=95=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EB=A5=BC=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=A0=EB=95=8C=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=88=98=20=EB=B6=80=EB=B6=84=EC=9D=B4=20=EC=9E=98=EB=A6=AC?= =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2748 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/skins/xe_gallery/list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/board/skins/xe_gallery/list.html b/modules/board/skins/xe_gallery/list.html index 1dce07363..30df0eec9 100644 --- a/modules/board/skins/xe_gallery/list.html +++ b/modules/board/skins/xe_gallery/list.html @@ -94,6 +94,7 @@ {@ $height = $module_info->thumbnail_height + 40; } +{@ $height += 20 } {@ $height += 25 } {@ $height += 25 } From 7b2ca28372dbf337e7b3033ec025eb6d1676c3b5 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 01:26:17 +0000 Subject: [PATCH 06/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=ED=8C=9D=EC=97=85=EC=97=90=EC=84=9C=20=EC=83=9D?= =?UTF-8?q?=EA=B8=B0=EB=8A=94=20js=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2749 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/tpl/js/document_admin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js index ec123896e..2a3e5262b 100644 --- a/modules/document/tpl/js/document_admin.js +++ b/modules/document/tpl/js/document_admin.js @@ -37,6 +37,7 @@ function completeManageDocument(ret_obj) { /* 선택된 모듈의 카테고리 목록을 가져오는 함수 */ function doGetCategoryFromModule(obj) { + if(!obj) return; var module_srl = obj.options[obj.selectedIndex].value; var params = new Array(); From 2967f63665b285c45409199995f229dcde5f6c76 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 02:10:19 +0000 Subject: [PATCH 07/11] =?UTF-8?q?#222=20=EA=B2=80=EC=83=89=EC=8B=9C/=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B3=80=EA=B2=BD=EC=8B=9C/=20=EB=B6=84?= =?UTF-8?q?=EB=A5=98=20=EC=84=A0=ED=83=9D=EC=8B=9C=EC=97=90=EB=8A=94=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EB=90=9C=20=EA=B8=80=EC=9D=98=20=EC=A0=9C?= =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EB=90=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A5=BC=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A5=BC=20=EB=8F=99=EC=9E=91=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=ED=95=98=EC=97=AC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=9E=85=EC=9E=A5=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B6=88=ED=8E=B8=EC=97=86=EB=8F=84=EB=A1=9D=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2750 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/board/board.view.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index a97638159..1d265fb7e 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -113,12 +113,6 @@ // 댓글에디터 설정 $this->setCommentEditor(0, 100); - // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자.. - if($document_srl && !$page && ($oDocument->isExists()&&!$oDocument->isNotice()) && !Context::get('category') && !Context::get('search_keyword')) { - $page = $oDocumentModel->getDocumentPage($document_srl, $this->module_srl, $this->list_count); - Context::set('page', $page); - } - // 목록을 구하기 위한 옵션 $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl $args->page = $page; ///< 페이지 @@ -146,6 +140,14 @@ } } + // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자.. + if($document_srl && ($oDocument->isExists()&&!$oDocument->isNotice()) && !$args->category_srl && !$args->search_keyword && $args->sort_index == 'list_order' && $args->order_type == 'asc') { + $page = $oDocumentModel->getDocumentPage($document_srl, $this->module_srl, $this->list_count); + Context::set('page', $page); + $args->page = $page; + } + + // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다) $output = $oDocumentModel->getDocumentList($args); From 7cdedec2445ba0582608c0935e6286f9f4bb2b48 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 03:05:27 +0000 Subject: [PATCH 08/11] =?UTF-8?q?#229=20=EA=B8=80=EC=9D=98=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EC=9D=B4=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EA=B8=80=20=EC=9E=90=EC=B2=B4=EA=B0=80=20=EC=9C=A0=ED=9A=A8?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EB=90=98=EB=8D=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=EB=A5=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2751 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index e8304a02b..128abc5aa 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -29,7 +29,7 @@ } function setAttribute($attribute) { - if(!$attribute->document_srl || !$attribute->content) { + if(!$attribute->document_srl) { $this->document_srl = null; return; } From 33871154c1663582662678030ffed2f728a31fb1 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 03:13:38 +0000 Subject: [PATCH 09/11] =?UTF-8?q?#230=20quotaion=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=97=90=20=EC=97=B4=EA=B3=A0/=EB=8B=AB?= =?UTF-8?q?=EA=B8=B0=20string=EC=97=90=20tag=EC=99=80=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=EB=90=9C=20=EB=AC=B8=EC=9E=90=EA=B0=80=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EB=90=98=EC=96=B4=EB=8F=84=20=EC=A0=95=EC=83=81=EC=A0=81?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9E=91=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2752 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/quotation/tpl/popup.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js index 74a77ac39..73c24bf22 100644 --- a/modules/editor/components/quotation/tpl/popup.js +++ b/modules/editor/components/quotation/tpl/popup.js @@ -15,6 +15,8 @@ function getQuotation() { var use_folder = node.getAttribute("use_folder"); var folder_opener = node.getAttribute("folder_opener"); var folder_closer = node.getAttribute("folder_closer"); + if(folder_opener) folder_opener = folder_opener.replace(/&/g,'&').replace(/>/g,'>').replace(/</,'<').replace(/"/,'"'); + if(folder_closer) folder_closer = folder_closer.replace(/&/g,'&').replace(/>/g,'>').replace(/</,'<').replace(/"/,'"'); var bold = node.getAttribute("bold"); var color = node.getAttribute("color"); var margin = node.getAttribute("margin"); @@ -84,6 +86,9 @@ function insertQuotation() { var folder_closer = xGetElementById("quotation_closer").value; if(!folder_opener||!folder_closer) use_folder = "N"; + folder_opener = folder_opener.replace(/&/g,'&').replace(/>/g,'>').replace(//g,'>').replace(/ Date: Fri, 12 Oct 2007 05:40:23 +0000 Subject: [PATCH 10/11] =?UTF-8?q?js/=20css=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=EC=8B=9C=20=EC=96=B4=EB=96=A4=20=EC=9D=B4?= =?UTF-8?q?=EC=9C=A0=EC=9D=B8=EC=A7=80=20=EC=A4=91=EB=B3=B5=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=83=9D=EA=B2=A8?= =?UTF-8?q?=EC=84=9C=20=EC=9D=B4=EB=A5=BC=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=ED=95=B4=EC=A3=BC=EB=8A=94=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=A5=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2753 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 7caa8577b..52f368ee0 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -715,7 +715,7 @@ function _getJsFile() { require_once("./classes/optimizer/Optimizer.class.php"); $oOptimizer = new Optimizer(); - return $oOptimizer->getOptimizedFiles($this->js_files, "js"); + return $oOptimizer->getOptimizedFiles(array_unique($this->js_files), "js"); } /** @@ -750,7 +750,7 @@ function _getCSSFile() { require_once("./classes/optimizer/Optimizer.class.php"); $oOptimizer = new Optimizer(); - return $oOptimizer->getOptimizedFiles($this->css_files, "css"); + return $oOptimizer->getOptimizedFiles(array_unique($this->css_files), "css"); } /** From 411541d0497550a0555a443c652fc318f2fdb814 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 12 Oct 2007 05:53:17 +0000 Subject: [PATCH 11/11] =?UTF-8?q?beta=200.2.1=20=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EB=B2=84=EC=A0=84=20=EB=AA=85?= =?UTF-8?q?=20=EC=98=AC=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2754 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index c5e6e79b9..453cfab53 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며 * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '0.2.0'); + define('__ZBXE_VERSION__', '0.2.1'); /** * @brief 디버깅 메세지 출력