diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-17 16:09:05 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-17 16:09:05 +0200 |
| commit | 3637cd395e39c1fa5b7279222abe1da5d2abcd00 (patch) | |
| tree | 1e0d9f54950fb16f83dbcdde1001be5323778be1 /phpBB/includes/functions.php | |
| parent | 48d3c68290b96c7d2a0e875ec3338f067a529b22 (diff) | |
| download | forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.gz forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.bz2 forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.xz forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.zip | |
[feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4fc2739f33..3533a4ca00 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1143,13 +1143,26 @@ function phpbb_tz_select_compare($a, $b) * * @param string $default A timezone to select * @param boolean $truncate Shall we truncate the options text -* @param boolean $return_tzs_only Shall we just return the options for the timezone selector, -* or also return the options for the time selector. * -* @return string/array Returns either the options for timezone selector -* or an array, also containing the options for the time selector. +* @return string Returns the options for timezone selector only +* +* @deprecated +*/ +function tz_select($default = '', $truncate = false) +{ + $timezone_select = phpbb_timezone_select($default, $truncate); + return $timezone_select['tz_select']; +} + +/** +* Options to pick a timezone and date/time +* +* @param string $default A timezone to select +* @param boolean $truncate Shall we truncate the options text +* +* @return array Returns an array, also containing the options for the time selector. */ -function tz_select($default = '', $truncate = false, $return_tzs_only = true) +function phpbb_timezone_select($default = '', $truncate = false) { global $user; @@ -1220,11 +1233,6 @@ function tz_select($default = '', $truncate = false, $return_tzs_only = true) } $tz_select .= '</optgroup>'; - if ($return_tzs_only) - { - return $tz_select; - } - return array( 'tz_select' => $tz_select, 'tz_dates' => $tz_dates, |