aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-07-18 18:59:25 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-07-18 18:59:25 +0200
commit81627e2888ac0987c941775276a720c2aa7fe142 (patch)
treeb461d769727953bf7f9afb9fe9f5b1c1c5a7161b /phpBB/includes/functions.php
parent14a07b11936bc061b5c82daa6387eb4645974fac (diff)
downloadforums-81627e2888ac0987c941775276a720c2aa7fe142.tar
forums-81627e2888ac0987c941775276a720c2aa7fe142.tar.gz
forums-81627e2888ac0987c941775276a720c2aa7fe142.tar.bz2
forums-81627e2888ac0987c941775276a720c2aa7fe142.tar.xz
forums-81627e2888ac0987c941775276a720c2aa7fe142.zip
[feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c6abcb27ef..6a4a67f9d7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1207,7 +1207,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
$opt_group = $timezone['offest'];
$selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : '';
- $tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>';
+ $tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . '</option>';
}
if (isset($user->lang['timezones'][$timezone['tz']]))
@@ -1229,7 +1229,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
}
$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
- $tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>';
+ $tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
}
$tz_select .= '</optgroup>';