holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing two PHP Warnings

Browse Source
This commit is contained in:
Ralf Becker 2019-06-04 09:43:25 +02:00
parent 99a223a5ad
commit 1f7682d87a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/DateTime.php
View File

@ -718,12 +718,12 @@ class DateTime extends \DateTime
public static function getUserTimezones($extra=null)
{
$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
$user_tzs = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
if (count($user_tzs) <= 1)
$user_tzs = $GLOBALS['egw_info']['user']['preferences']['common']['tz_selection'];
if (!is_array($user_tzs))
{
$user_tzs = $tz ? array($tz) : array();
$user_tzs = $user_tzs ? explode(',', $user_tzs) : array();
}
if ($tz && !in_array($tz,$user_tzs))
if ($tz && !in_array($tz, $user_tzs))
{
$user_tzs = array_merge(array($tz),$user_tzs);
}