diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
| commit | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (patch) | |
| tree | f6058aff04281232666162f15b5d3054b349240c /phpBB/includes/functions_compatibility.php | |
| parent | f3fef8934ee1614bc158c05699e57f0ba8a3fcb6 (diff) | |
| parent | 457e13634e3b371fbb5fbf1116c761311a683957 (diff) | |
| download | forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.gz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.bz2 forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.xz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.zip | |
Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
Diffstat (limited to 'phpBB/includes/functions_compatibility.php')
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 093cb19538..ea092c83bc 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -133,10 +133,9 @@ function phpbb_clean_path($path) */ function tz_select($default = '', $truncate = false) { - global $user; + global $template, $user; - $timezone_select = phpbb_timezone_select($user, $default, $truncate); - return $timezone_select['tz_select']; + return phpbb_timezone_select($template, $user, $default, $truncate); } /** |