diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-05-20 13:51:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-05-20 13:51:53 +0200 |
| commit | c9d64d75f3acab6b44d28cd7bcc6e7e5dd042e77 (patch) | |
| tree | afc3304380859d44e651a534a523c1629ab9557b /Zotlabs/Module | |
| parent | 9651689bb811630612397dde6281c27bdc649036 (diff) | |
| download | volse-hubzilla-c9d64d75f3acab6b44d28cd7bcc6e7e5dd042e77.tar.gz volse-hubzilla-c9d64d75f3acab6b44d28cd7bcc6e7e5dd042e77.tar.bz2 volse-hubzilla-c9d64d75f3acab6b44d28cd7bcc6e7e5dd042e77.zip | |
move smart birthday feature to calendar settings and override the adjust flag at display time instead of import
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index 87bac2762..96d32039e 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -345,6 +345,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller { if(! $tz) $tz = 'UTC'; + if($rr['etype'] === 'birthday') + $rr['adjust'] = intval(feature_enabled(local_channel(), 'smart_birthdays')); + $start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c')); if ($rr['nofinish']){ $end = null; |