mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2844 from marc1706/ticket/12858

Browse Source 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
This commit is contained in:
Joas Schilling
2014-09-24 13:47:59 +02:00
parent f3fef8934e 457e13634e
commit 85bc9b69ae
11 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/acp/acp_board.php
View File

@@ -904,12 +904,11 @@ class acp_board
*/
function timezone_select($value, $key)
{
global $user;
global $template, $user;
$timezone_select = phpbb_timezone_select($user, $value, true);
$timezone_select['tz_select'];
$timezone_select = phpbb_timezone_select($template, $user, $value, true);
return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>';
return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select . '</select>';
}
/**

4
phpBB/includes/acp/acp_users.php
View File

@@ -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'],
);
/**