From fb25cf42fd109affaf0ff4065d5777f37172eb89 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Fri, 10 Jul 2015 11:18:58 +0900 Subject: [PATCH 1/8] =?UTF-8?q?console.log=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 구버전 IE에서는 개발자 도구가 열려있지 않을 때 console 객체를 사용할 수 없습니다. 따라서 오류가 발생하고, 이 때문에 페이지의 스크립트가 의도치 않게 멈출 수 있습니다. 이점을 수정합니다. --- common/js/plugins/jquery.fileupload/js/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js index ef10b93272..2fa8874e0d 100644 --- a/common/js/plugins/jquery.fileupload/js/main.js +++ b/common/js/plugins/jquery.fileupload/js/main.js @@ -287,7 +287,6 @@ obj.editor_sequence = data.editorSequence; $.exec_json('file.getFileList', obj, function(res){ - console.log(res); data.uploadTargetSrl = res.upload_target_srl; editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl; data.uploadTargetSrl = res.uploadTargetSrl; From 115fb74816612e8aa4174d535eda9bca7436ad2e Mon Sep 17 00:00:00 2001 From: YJSoft Date: Fri, 10 Jul 2015 12:16:40 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20unregisterApp?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit unregisterApp은 인수로 sApp을 요구하나 빈 인수를 전달하여 스크립트 오류가 발생하는 부분을 수정합니다. --- common/js/plugins/jquery.fileupload/js/main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js index ef10b93272..b6d16f0ecc 100644 --- a/common/js/plugins/jquery.fileupload/js/main.js +++ b/common/js/plugins/jquery.fileupload/js/main.js @@ -366,8 +366,6 @@ return u; }; - - xe.unregisterApp(); })(jQuery); From ec6f86d2e8f06291464519c6f659582e4d0fffd7 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Sat, 11 Jul 2015 13:25:43 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=EC=8A=AC?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=8D=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=20swi?= =?UTF-8?q?per-slide=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 데모 슬라이더만 정상 동작하고 사용자 슬라이더는 동작하지 않는 문제를 수정합니다. --- layouts/xedition/layout.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 61ecbed399..dc38c065bc 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -307,35 +307,35 @@

{$sub_header_title}

-
+
{$layout_info->slide_text1}
-
+
{$layout_info->slide_text2}
-
+
{$layout_info->slide_text3}
-
+
{$layout_info->slide_text4}
-
+
{$layout_info->slide_text5} From a8b594b97512026b1ac1836421cc9caece607ca8 Mon Sep 17 00:00:00 2001 From: xedev Date: Mon, 13 Jul 2015 10:22:19 +0900 Subject: [PATCH 4/8] SECISSUE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit getExtraValue, getExtraEidValue 함수 사용시 값 필터링이 되지 않는 문제를 수정합니다. --- classes/extravar/Extravar.class.php | 10 ++++++++++ modules/document/document.item.php | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index 7438db2b93..821a7c62b4 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -289,6 +289,16 @@ function _getTypeValue($type, $value) } } + /** + * Returns a value for HTML + * + * @return string Returns a value expressed in HTML. + */ + function getValue() + { + return $this->_getTypeValue($this->type, $this->value); + } + /** * Returns a value for HTML * diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 0604cf69c4..8c240b9ee6 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -651,7 +651,7 @@ function getExtraVars() function getExtraValue($idx) { $extra_vars = $this->getExtraVars(); - return $extra_vars[$idx]->value; + return $extra_vars[$idx]->getValue(); } function getExtraValueHTML($idx) @@ -679,7 +679,7 @@ function getExtraEidValue($eid) $extra_eid[$key->eid] = $key; } } - return $extra_eid[$eid]->value; + return $extra_eid[$eid]->getValue(); } function getExtraEidValueHTML($eid) From f5f57aacd3acb37ff1e71fda771921b236e701e2 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 13 Jul 2015 13:34:47 +0900 Subject: [PATCH 5/8] =?UTF-8?q?fix=20#1421=20CKEditor=EC=9D=98=20custom=20?= =?UTF-8?q?config=20=ED=8C=8C=EC=9D=BC=EC=9D=98=20=EC=A1=B4=EC=9E=AC=20?= =?UTF-8?q?=EC=9C=A0=EB=AC=B4=EB=A5=BC=20=ED=99=95=EC=9D=B8=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/editor/skins/ckeditor/editor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html index 093301a1af..850691e896 100755 --- a/modules/editor/skins/ckeditor/editor.html +++ b/modules/editor/skins/ckeditor/editor.html @@ -32,9 +32,9 @@