From f4761b5e0847a95944aaf9b00057eaa059995b81 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Sep 2014 19:07:24 +0200
Subject: [ticket/12858] Directly return and use timezone selects

PHPBB3-12858
---
 phpBB/includes/acp/acp_board.php | 3 +--
 phpBB/includes/acp/acp_users.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/acp')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 160a52a1bf..9c9e32b57c 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -907,9 +907,8 @@ class acp_board
 		global $template, $user;
 
 		$timezone_select = phpbb_timezone_select($template, $user, $value, true);
-		$timezone_select['tz_select'];
 
-		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>';
+		return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select . '</select>';
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c9239e534a..31b033604d 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($template, $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,
-- 
cgit v1.2.1