diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
| commit | 77ed437b79a2f26a22bcb027fed0e2542a8ed099 (patch) | |
| tree | 03f43e4bc4bd70e3c91572322eda9316f97bb080 /phpBB/includes/functions_compatibility.php | |
| parent | cb92b4668ec9276fabcf9fad12930228f63f6c19 (diff) | |
| parent | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (diff) | |
| download | forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.gz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.bz2 forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.xz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/timezone_option.html
Diffstat (limited to 'phpBB/includes/functions_compatibility.php')
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 093cb19538..ea092c83bc 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -133,10 +133,9 @@ function phpbb_clean_path($path) */ function tz_select($default = '', $truncate = false) { - global $user; + global $template, $user; - $timezone_select = phpbb_timezone_select($user, $default, $truncate); - return $timezone_select['tz_select']; + return phpbb_timezone_select($template, $user, $default, $truncate); } /** |