diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
| commit | 77ed437b79a2f26a22bcb027fed0e2542a8ed099 (patch) | |
| tree | 03f43e4bc4bd70e3c91572322eda9316f97bb080 /phpBB/includes/acp/acp_users.php | |
| parent | cb92b4668ec9276fabcf9fad12930228f63f6c19 (diff) | |
| parent | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (diff) | |
| download | forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.gz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.bz2 forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.xz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/timezone_option.html
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index b6c6a7d4d9..5a4175a6fe 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1661,7 +1661,7 @@ class acp_users ${'s_sort_' . $sort_option . '_dir'} .= '</select>'; } - $timezone_selects = phpbb_timezone_select($user, $data['tz'], true); + phpbb_timezone_select($template, $user, $data['tz'], true); $user_prefs_data = array( 'S_PREFS' => true, 'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true, @@ -1700,8 +1700,6 @@ class acp_users 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_STYLE_OPTIONS' => style_select($data['style']), - 'S_TZ_OPTIONS' => $timezone_selects['tz_select'], - 'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'], ); /** |