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

Fix #1934 add 'default' option to domain timezone

Browse source
This commit is contained in:
Kijin Sung 2022-07-03 01:03:00 +09:00
parent a5f056284c
commit 59a1215c87
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1154,7 +1154,7 @@ class adminAdminController extends admin
// Validate the default time zone.
$timezone_list = Rhymix\Framework\DateTime::getTimezoneList();
if (!isset($timezone_list[$vars->default_timezone]))
if ($vars->default_timezone !== 'default' && !isset($timezone_list[$vars->default_timezone]))
{
throw new Rhymix\Framework\Exception('msg_invalid_timezone');
}

1
modules/admin/tpl/config_domains_edit.html
View file

@ -90,6 +90,7 @@
<label class="x_control-label" for="default_timezone">{$lang->timezone}</label>
<div class="x_controls">
<select name="default_timezone">
<option value="default" selected="selected"|cond="$domain_timezone === 'default'">{$lang->follow_default_lang}</option>
<option loop="$timezones => $key,$val" value="{$key}" selected="selected"|cond="$key == $domain_timezone">{$val}</option>
</select>
</div>