diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-05-22 12:40:37 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-05-22 12:40:37 +0200 |
| commit | 39613aa2d9298e13629b5b4a7c6b6f1bbe7edca5 (patch) | |
| tree | f992777423a1b04b757578f9cfbf90be349091de /include | |
| parent | e834c7fe3e421a7a52e27b274d8ea35bd2ad5bec (diff) | |
| download | volse-hubzilla-39613aa2d9298e13629b5b4a7c6b6f1bbe7edca5.tar.gz volse-hubzilla-39613aa2d9298e13629b5b4a7c6b6f1bbe7edca5.tar.bz2 volse-hubzilla-39613aa2d9298e13629b5b4a7c6b6f1bbe7edca5.zip | |
improve timezone detection for caldav and remove smart birthday feature. Force adjust birthdays until we agree on how to deal with this.
Diffstat (limited to 'include')
| -rw-r--r-- | include/event.php | 4 | ||||
| -rw-r--r-- | include/features.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/event.php b/include/event.php index 9bae69f5c..eb8731f46 100644 --- a/include/event.php +++ b/include/event.php @@ -83,11 +83,11 @@ function format_event_obj($jobject) { '$title' => zidify_links(smilies(bbcode($object['title']))), '$dtstart_label' => t('Starts:'), '$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($tz, date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', date_default_timezone_get(), $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('Finishes:'), '$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($tz, date_default_timezone_get(), $object['dtend'] , $bd_format )) : day_translate(datetime_convert('UTC', date_default_timezone_get(), $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 ))) )); $event['content'] = replace_macros(get_markup_template('event_item_content.tpl'),array( diff --git a/include/features.php b/include/features.php index a44b424a6..5841395c5 100644 --- a/include/features.php +++ b/include/features.php @@ -96,14 +96,15 @@ function get_features($filtered = true, $level = (-1)) { false, get_config('feature_lock','event_tz_select'), ], - +/* [ 'smart_birthdays', t('Smart Birthdays'), t('Make birthday events timezone aware in case your friends are scattered across the planet.'), - true, + false, get_config('feature_lock','smart_birthdays'), ] +*/ ], |