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'); } 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 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(); } 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