diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-05 21:44:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:08:57 +0200 |
| commit | 66f7d45603417df7619323977de62aebce0bf676 (patch) | |
| tree | 676f4c9494914f6c6e523a00df9bf9d758a571be /phpBB/includes/ucp/ucp_prefs.php | |
| parent | 3c6272ff0475dc19cc67553f370ce227214d0613 (diff) | |
| download | forums-66f7d45603417df7619323977de62aebce0bf676.tar forums-66f7d45603417df7619323977de62aebce0bf676.tar.gz forums-66f7d45603417df7619323977de62aebce0bf676.tar.bz2 forums-66f7d45603417df7619323977de62aebce0bf676.tar.xz forums-66f7d45603417df7619323977de62aebce0bf676.zip | |
[feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 3f5f573389..4239afc96e 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -131,6 +131,7 @@ class ucp_prefs } $dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>'; + $tz_select = tz_select($data['tz'], true, false); $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', @@ -153,7 +154,8 @@ class ucp_prefs 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), - 'S_TZ_OPTIONS' => tz_select($data['tz'], true), + 'S_TZ_OPTIONS' => $tz_select['tz_select'], + 'S_TZ_DATE_OPTIONS' => $tz_select['tz_dates'], 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) ); |