diff options
| author | Kevin Jardine <kevinjardine@yahoo.com> | 2012-08-20 10:30:56 +0200 |
|---|---|---|
| committer | Kevin Jardine <kevinjardine@yahoo.com> | 2012-08-20 10:30:56 +0200 |
| commit | 381e87e243e357d804f6113758ac00b69a0b436b (patch) | |
| tree | 6685526af686f1c4861148d83b8e9f937011e3fc /views | |
| parent | 3544d24791d4df96fff45d4f385bce368769cd80 (diff) | |
| download | elgg-381e87e243e357d804f6113758ac00b69a0b436b.tar.gz elgg-381e87e243e357d804f6113758ac00b69a0b436b.tar.bz2 | |
fixed conference button appearance time for non-admins
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/event_calendar/conference_button.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/default/event_calendar/conference_button.php b/views/default/event_calendar/conference_button.php index f6fedf4f6..baa30cc68 100644 --- a/views/default/event_calendar/conference_button.php +++ b/views/default/event_calendar/conference_button.php @@ -9,12 +9,12 @@ $event = $vars['event']; if ($event) { elgg_load_library('elgg:event_calendar'); $user_guid = elgg_get_logged_in_user_guid(); - $termination_time = $event->real_end_time + 60*60*24; + $termination_time = strtotime("1 day",$event->real_end_time); if ($termination_time < time()) { $in_time_window = FALSE; } else if ($event->canEdit()) { $in_time_window = TRUE; - } else if (event_calendar_has_personal_event($event->guid, $user_guid) && ($event->start_date - 15*60) >= time()) { + } else if (event_calendar_has_personal_event($event->guid, $user_guid) && (strtotime('-15 minutes',$event->start_date) <= time())) { $in_time_window = TRUE; } else { $in_time_window = FALSE; |