diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -187,23 +187,33 @@ pht('Ends'), phabricator_datetime($event->getDateTo(), $viewer)); + $properties->addProperty( + pht('Host'), + $viewer->renderHandle($event->getUserPHID())); + $invitees = $event->getInvitees(); - $invitee_list = new PHUIStatusListView(); - foreach ($invitees as $invitee) { + foreach ($invitees as $key => $invitee) { if ($invitee->isUninvited()) { - continue; + unset($invitees[$key]); } - $item = new PHUIStatusItemView(); - $invitee_phid = $invitee->getInviteePHID(); - $target = $viewer->renderHandle($invitee_phid); - $item->setNote($invitee->getStatus()) - ->setTarget($target); - $invitee_list->addItem($item); } - $properties->addProperty( - pht('Host'), - $viewer->renderHandle($event->getUserPHID())); + if ($invitees) { + $invitee_list = new PHUIStatusListView(); + foreach ($invitees as $invitee) { + $item = new PHUIStatusItemView(); + $invitee_phid = $invitee->getInviteePHID(); + $target = $viewer->renderHandle($invitee_phid); + $item->setNote($invitee->getStatus()) + ->setTarget($target); + $invitee_list->addItem($item); + } + } else { + $invitee_list = phutil_tag( + 'em', + array(), + pht('None')); + } $properties->addProperty( pht('Invitees'),