From 455e39cbba85bedfe5ab6d9a41be3b2a4c4eba1a Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 19 Dec 2017 12:00:50 +0900 Subject: [PATCH] Fix unnecessary reloading of user lang --- modules/module/module.admin.controller.php | 5 +++-- modules/module/module.controller.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index e8e35d9dc..6c4cd0cf0 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -863,7 +863,7 @@ class moduleAdminController extends module $args->site_srl = $site_srl; } $output = executeQueryArray('module.getLang', $args); - if(!$output->toBool() || !$output->data) return; + if(!$output->toBool()) return; $langMap = array(); foreach($output->data as $lang) @@ -905,7 +905,8 @@ class moduleAdminController extends module Rhymix\Framework\Cache::set('site_and_module:user_defined_langs:' . $args->site_srl . ':' . $langCode, $langMap[$langCode], 0, true); } - return $langMap[Context::getLangType()]; + $currentLang = Context::getLangType(); + return isset($langMap[$currentLang]) ? $langMap[$currentLang] : array(); } public function procModuleAdminSetDesignInfo() diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 7e4438410..f899ff223 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -1048,11 +1048,11 @@ class moduleController extends module { if($lang === null) { - $lang = Rhymix\Framework\Cache::get('site_and_module:user_defined_langs:' . $args->site_srl . ':' . Context::getLangType()); + $lang = Rhymix\Framework\Cache::get('site_and_module:user_defined_langs:0:' . Context::getLangType()); if($lang === null) { $oModuleAdminController = getAdminController('module'); - $lang = $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl); + $lang = $oModuleAdminController->makeCacheDefinedLangCode(0); } }