fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-12 06:52:12 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1722 incorrect language selection when domain setting conflicts with system setting

Browse source
This commit is contained in:
Kijin Sung 2021-06-19 21:55:14 +09:00
parent 1ab02086bd
commit 865e83a46a
7 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/admin.admin.controller.php
View file

@ -1125,7 +1125,7 @@ class adminAdminController extends admin
// Validate the default language.
$enabled_lang = Rhymix\Framework\Config::get('locale.enabled_lang');
if (!in_array($vars->default_lang, $enabled_lang))
if ($vars->default_lang !== 'default' && !in_array($vars->default_lang, $enabled_lang))
{
throw new Rhymix\Framework\Exception('msg_lang_is_not_enabled');
}