Merge pull request #1 from xpressengine/develop

Tracking Develop
xpressengine · Feb 13, 2018 · c2893ab · c2893ab
2 parents df345ec + 1b45b96
commit c2893ab
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
 	<title xml:lang="ko">SEO</title>
+	<title xml:lang="vi">SEO</title>
+	<title xml:lang="zh-CN">SEO</title>
+	<title xml:lang="jp">SEO</title>
+	<title xml:lang="en">SEO</title>
+	<title xml:lang="es">SEO</title>
+	<title xml:lang="ru">SEO</title>
+	<title xml:lang="zh-TW">SEO</title>
+	<title xml:lang="tr">SEO</title>
 	<description xml:lang="ko">검색엔진 최적화</description>
+	<description xml:lang="vi">Tối ưu hoá Công cụ Tìm kiếm</description>
+	<description xml:lang="jp">検索エンジンの最適化</description>
+	<description xml:lang="en">Optimize Search Engine</description>
+	<description xml:lang="es">Optimizar el motor de búsqueda</description>
+	<description xml:lang="ru">Оптимизировать поисковую систему</description>
+	<description xml:lang="zh-TW">-</description>
+	<description xml:lang="tr">Arama Motorunu Optimize Edin</description>
 	<version>1.9.0</version>
 	<date>2017-11-30</date>
 	<license>MIT</license>