diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-09 19:08:51 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-09 19:08:51 -0600 |
| commit | d6930df7a22f47619cc4f5e705b64447060b6c32 (patch) | |
| tree | 3f051f4407522223d3430844f8d54cf4196d2c53 /phpBB/includes | |
| parent | 3f5d938a95669e9985de5593af836b35bb25e872 (diff) | |
| parent | f60540d31f89bfd1ee8aabb2ce85fe3cd7dfe829 (diff) | |
| download | forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.gz forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.bz2 forums-d6930df7a22f47619cc4f5e705b64447060b6c32.tar.xz forums-d6930df7a22f47619cc4f5e705b64447060b6c32.zip | |
Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index c57aec00a0..1de38fddb7 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -457,6 +457,7 @@ class ucp_register 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_TZ_OPTIONS' => $timezone_selects['tz_select'], 'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'], + 'S_TZ_PRESELECT' => !$submit, 'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false, 'S_REGISTRATION' => true, 'S_COPPA' => $coppa, |