diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:02:34 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:02:34 +0200 |
| commit | 6da582e8be50fa7211706625402215f6f87ed48b (patch) | |
| tree | 3510b9c286dddbc806fef61d1e3e3e0fa0976256 /phpBB/includes | |
| parent | 29716cd5d523e2287e5572c52e1b7b8bacda8087 (diff) | |
| parent | 097854ca8594676439dd8aab740674c717dda4cd (diff) | |
| download | forums-6da582e8be50fa7211706625402215f6f87ed48b.tar forums-6da582e8be50fa7211706625402215f6f87ed48b.tar.gz forums-6da582e8be50fa7211706625402215f6f87ed48b.tar.bz2 forums-6da582e8be50fa7211706625402215f6f87ed48b.tar.xz forums-6da582e8be50fa7211706625402215f6f87ed48b.zip | |
Merge branch 'ticket/p/9570' into develop-olympus
* ticket/p/9570:
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 7680d8996c..927e72010e 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -58,7 +58,7 @@ class acp_board 'board_disable_msg' => false, 'default_lang' => array('lang' => 'DEFAULT_LANGUAGE', 'validate' => 'lang', 'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false), 'default_dateformat' => array('lang' => 'DEFAULT_DATE_FORMAT', 'validate' => 'string', 'type' => 'custom', 'method' => 'dateformat_select', 'explain' => true), - 'board_timezone' => array('lang' => 'SYSTEM_TIMEZONE', 'validate' => 'string', 'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false), + 'board_timezone' => array('lang' => 'SYSTEM_TIMEZONE', 'validate' => 'string', 'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => true), 'board_dst' => array('lang' => 'SYSTEM_DST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false), 'override_user_style' => array('lang' => 'OVERRIDE_STYLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |