aboutsummaryrefslogtreecommitdiffstats
path: root/include/event.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-26 20:22:40 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-26 20:22:40 +0200
commitf1b61d5882cba9584ef35f574b29050397cb8d58 (patch)
treecf876cb35574e441c42be244af5e4b21b443a776 /include/event.php
parente466d72058b2543bec69c77d2730828acada38a1 (diff)
downloadvolse-hubzilla-f1b61d5882cba9584ef35f574b29050397cb8d58.tar.gz
volse-hubzilla-f1b61d5882cba9584ef35f574b29050397cb8d58.tar.bz2
volse-hubzilla-f1b61d5882cba9584ef35f574b29050397cb8d58.zip
mod cal band-aid fixes
Diffstat (limited to 'include/event.php')
-rw-r--r--include/event.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/event.php b/include/event.php
index ca08a67b5..de4e692b8 100644
--- a/include/event.php
+++ b/include/event.php
@@ -27,6 +27,7 @@ function format_event_html($ev) {
if(! ((is_array($ev)) && count($ev)))
return '';
+ $tz = (($ev['timezone']) ? $ev['timezone'] : 'UTC');
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
@@ -39,7 +40,7 @@ function format_event_html($ev) {
$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<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)))
@@ -49,7 +50,7 @@ function format_event_html($ev) {
$o .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<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 )))