diff options
| author | Mario <mario@mariovavti.com> | 2020-04-03 22:01:44 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-04-03 22:01:44 +0200 |
| commit | cade25a112d3884034090135db421dab805a93d6 (patch) | |
| tree | 47c05dd658a889725c4455ac4f2f19bb4e1da7e9 | |
| parent | a4831b0f7c608a4337954dfe0ad84486bdc606d6 (diff) | |
| download | volse-hubzilla-cade25a112d3884034090135db421dab805a93d6.tar.gz volse-hubzilla-cade25a112d3884034090135db421dab805a93d6.tar.bz2 volse-hubzilla-cade25a112d3884034090135db421dab805a93d6.zip | |
Revert "more timezone changes"
This reverts commit cec2e92fe381a5e4bb67426290303639dd260358
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 4 | ||||
| -rw-r--r-- | include/event.php | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index c92e6ca1b..7d75a7e41 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -34,8 +34,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller { $adjust = intval($_POST['adjust']); - $start = datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtstart'])); - $finish = datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtend'])); + $start = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart'])); + $finish = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend'])); $summary = escape_tags(trim($_POST['summary'])); $desc = escape_tags(trim($_POST['desc'])); diff --git a/include/event.php b/include/event.php index fbc46100f..b92d2c8a9 100644 --- a/include/event.php +++ b/include/event.php @@ -40,7 +40,7 @@ function format_event_html($ev) { $o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span> <span class="dtstart" title="' . datetime_convert('UTC', 'UTC', $ev['dtstart'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . '" >' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + . (($ev['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $ev['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['dtstart'] , $bd_format))) @@ -50,7 +50,7 @@ function format_event_html($ev) { $o .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span> <span class="dtend" title="' . datetime_convert('UTC','UTC',$ev['dtend'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . '" >' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + . (($ev['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $ev['dtend'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['dtend'] , $bd_format ))) @@ -98,11 +98,11 @@ function format_event_obj($jobject) { '$title' => zidify_links(smilies(bbcode($object['title']))), '$dtstart_label' => t('Start:'), '$dtstart_title' => datetime_convert($tz, date_default_timezone_get(), $object['dtstart'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )), - '$dtstart_dt' => (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtstart'] , $bd_format))), + '$dtstart_dt' => (($object['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtstart'] , $bd_format))), '$finish' => (($object['nofinish']) ? false : true), '$dtend_label' => t('End:'), '$dtend_title' => datetime_convert($tz, date_default_timezone_get(), $object['dtend'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )), - '$dtend_dt' => (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['dtend'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtend'] , $bd_format ))), + '$dtend_dt' => (($object['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $object['dtend'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtend'] , $bd_format ))), '$allday' => $allday, '$oneday' => $oneday )); @@ -1097,8 +1097,6 @@ function event_store_item($arr, $event) { ); if($r) { - set_iconfig($r[0], 'event', 'timezone', $arr['timezone'], true); - $object = json_encode(array( 'type' => ACTIVITY_OBJ_EVENT, 'id' => z_root() . '/event/' . $r[0]['resource_id'], @@ -1169,7 +1167,7 @@ function event_store_item($arr, $event) { } $item_id = $r[0]['id']; - //set_iconfig($item_id, 'event', 'timezone', $arr['timezone'], true); + set_iconfig($item_id, 'event', 'timezone', $arr['timezone'], true); /** * @hooks event_updated |