From 8ab63a0bce178529c35327eb0bfc607e3b9bdee0 Mon Sep 17 00:00:00 2001 From: howtoxe Date: Thu, 25 Jan 2018 17:32:55 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=95=84=EC=9B=83=EC=97=90=EC=84=9C=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=9D=98=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=EA=B0=80=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/tpl/js/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 0eee8ae5be..b86abcf2d5 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -1827,7 +1827,7 @@ jQuery(function($){ $.fn.xeLoadMultilingualWindowHtml = function(){ function on_complete(data){ // append html - var $content = $('#content'); + var $content = ($('#content').length > 0) ? $('#content') : $('body'); $(data.html).appendTo($content).xeMultilingualWindow(); $('.lang_code').trigger('loaded-multilingualWindow'); } From d1fbe23b1f3644be20b19c3957ca993ceb495f80 Mon Sep 17 00:00:00 2001 From: Laighlinne Date: Wed, 7 Feb 2018 06:27:36 +0900 Subject: [PATCH 2/4] Update info.xml --- modules/seo/conf/info.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/seo/conf/info.xml b/modules/seo/conf/info.xml index a11ca2436e..574ce087f2 100644 --- a/modules/seo/conf/info.xml +++ b/modules/seo/conf/info.xml @@ -1,7 +1,22 @@ SEO + SEO + SEO + SEO + SEO + SEO + SEO + SEO + SEO 검색엔진 최적화 + Tối ưu hoá Công cụ Tìm kiếm + 検索エンジンの最適化 + Optimize Search Engine + Optimizar el motor de búsqueda + Оптимизировать поисковую систему + - + Arama Motorunu Optimize Edin 1.9.0 2017-11-30 MIT From 9e4043403dc0ffc18f6c416bde3fcc8b79dfd15e Mon Sep 17 00:00:00 2001 From: howtoxe Date: Wed, 7 Feb 2018 12:15:35 +0900 Subject: [PATCH 3/4] Update document.model.php --- modules/document/document.model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/document/document.model.php b/modules/document/document.model.php index fae5681d11..93915a23b8 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -116,11 +116,14 @@ function setToAllDocumentExtraVars() if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]); // Information processing if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]); - + + // static 데이터를 갱신해주기 위해 들어간 코드같으나 어차피 언어 변경 자체는 페이지 전환이 일어나면서 발생하는게 대부분이라 효용이 없음. 또한 예기치않게 권한이 없는 다국어 문서 내용을 보여주는 부효과가 일어남 + /* if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code]) { unset($checked_documents[$document_srl]); } + */ $GLOBALS['XE_EXTRA_VARS'][$document_srl] = $evars->getExtraVars(); } From 1b45b9659ddedeb040b289b586c69101cbcb15e2 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 13 Feb 2018 16:21:51 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix=20#2178=20=EB=AC=B8=EC=84=9C=20?= =?UTF-8?q?=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=EC=97=90=20=ED=8E=B8=EC=A7=91=EC=9E=90=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EA=B0=80=20=EA=B8=80=20=EC=9E=91=EC=84=B1=EC=9E=90=EC=9D=98=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A1=9C=20=EC=9E=98=EB=AA=BB=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0?= =?UTF-8?q?=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index c52362e098..c51f1722c7 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -397,10 +397,10 @@ function updateDocument($source_obj, $obj, $manual_updated = FALSE) $args->document_srl = $obj->document_srl; $args->module_srl = $module_srl; if($document_config->use_history == 'Y') $args->content = $source_obj->get('content'); - $args->nick_name = $source_obj->get('nick_name'); - $args->member_srl = $source_obj->get('member_srl'); + $args->nick_name = $logged_info->nick_name; + $args->member_srl = $logged_info->member_srl; $args->regdate = $source_obj->get('last_update'); - $args->ipaddress = $source_obj->get('ipaddress'); + $args->ipaddress = $_SERVER['REMOTE_ADDR']; $output = executeQuery("document.insertHistory", $args); } else