From 9c310f789ffad41af46b36128f197176dc1f12e3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Sep 2014 17:52:48 +0200 Subject: [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix PHPBB3-12858 --- phpBB/includes/functions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0678ea7fda..d280ab0f37 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1095,13 +1095,13 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals $tz_select .= ($opt_group) ? '' : ''; $tz_select .= ''; $opt_group = $timezone['offset']; - $template->assign_block_vars('tz_select', array( + $template->assign_block_vars('timezone_select', array( 'LABEL' => $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']), 'VALUE' => $key . ' - ' . $timezone['current'], )); $selected = (!empty($default_offset) && strpos($key, $default_offset) !== false) ? ' selected="selected"' : ''; - $template->assign_block_vars('tz_date', array( + $template->assign_block_vars('timezone_date', array( 'VALUE' => $key . ' - ' . $timezone['current'], 'SELECTED' => !empty($selected), 'TITLE' => $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']), @@ -1113,17 +1113,17 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals { $label = $user->lang['timezones'][$label]; } - $title = $timezone['offset'] . ' - ' . $label; + $title = $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $label); if ($truncate) { $label = truncate_string($label, 50, 255, false, '...'); } - // Also generate tz_select for backwards compatibility + // Also generate timezone_select for backwards compatibility $selected = ($timezone['tz'] === $default) ? ' selected="selected"' : ''; $tz_select .= ''; - $template->assign_block_vars('tz_select.tz_options', array( + $template->assign_block_vars('timezone_select.timezone_options', array( 'TITLE' => $title, 'VALUE' => $timezone['tz'], 'SELECTED' => !empty($selected), -- cgit v1.2.1