From 9ebee7de323eae3ac86f025f44429d2d4bc995b1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Sep 2014 14:15:16 +0200 Subject: [ticket/12858] Generate timezone selects with template loop PHPBB3-12858 --- phpBB/includes/functions_compatibility.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_compatibility.php') diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 093cb19538..6db23d9f65 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -133,9 +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); + $timezone_select = phpbb_timezone_select($template, $user, $default, $truncate); return $timezone_select['tz_select']; } -- cgit v1.2.1 From f4761b5e0847a95944aaf9b00057eaa059995b81 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Sep 2014 19:07:24 +0200 Subject: [ticket/12858] Directly return and use timezone selects PHPBB3-12858 --- phpBB/includes/functions_compatibility.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/includes/functions_compatibility.php') diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 6db23d9f65..ea092c83bc 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -135,8 +135,7 @@ function tz_select($default = '', $truncate = false) { global $template, $user; - $timezone_select = phpbb_timezone_select($template, $user, $default, $truncate); - return $timezone_select['tz_select']; + return phpbb_timezone_select($template, $user, $default, $truncate); } /** -- cgit v1.2.1