aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php28
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,