CRM-12134

diff --git a/CRM/Event/Page/ICalendar.php b/CRM/Event/Page/ICalendar.php
index 957d69ba7ee024297c693e226f6c9e736fa74965..b9c89a2ff2b77b4954740186072f31976324a6f5 100644 (file)
--- a/CRM/Event/Page/ICalendar.php
+++ b/CRM/Event/Page/ICalendar.php
@@ -58,6 +58,8 @@ class CRM_Event_Page_ICalendar extends CRM_Core_Page {
     $html     = CRM_Utils_Request::retrieve('html', 'Positive', $this, FALSE, 0);
     $rss      = CRM_Utils_Request::retrieve('rss', 'Positive', $this, FALSE, 0);
 
+    CRM_Utils_System::setTitle(ts('Current and Upcoming Events'));
+
     $info = CRM_Event_BAO_Event::getCompleteInfo($start, $type, $id, $end);
     $this->assign('events', $info);
     $this->assign('timezone', @date_default_timezone_get());

diff --git a/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php b/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
index 56134ed692992bb64103d3125357821d2a9bf8e1..6b1dc648f2a8debce8db3f846c861eb34339deea 100644 (file)
--- a/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
+++ b/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
@@ -41,7 +41,7 @@ class CRM_Event_Page_ParticipantListing_NameStatusAndDate extends CRM_Core_Page
   protected $_eventTitle;
 
   protected $_pager;
-  
+
   function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Integer', $this, TRUE);
 
@@ -70,7 +70,7 @@ class CRM_Event_Page_ParticipantListing_NameStatusAndDate extends CRM_Core_Page
 
     $fromClause = "
 FROM       civicrm_contact
-INNER JOIN civicrm_participant ON civicrm_contact.id = civicrm_participant.contact_id 
+INNER JOIN civicrm_participant ON civicrm_contact.id = civicrm_participant.contact_id
 INNER JOIN civicrm_event       ON civicrm_participant.event_id = civicrm_event.id
 ";
 
@@ -99,14 +99,15 @@ LIMIT    $offset, $rowCount";
     $object       = CRM_Core_DAO::executeQuery($query, $params);
     $statusLookup = CRM_Event_PseudoConstant::participantStatus();
     while ($object->fetch()) {
+      $status = CRM_Utils_Array::value($object->status_id, $statusLookup);
+      if ($status) {
+        $status = ts($status);
+      }
       $row = array(
         'id' => $object->contact_id,
         'participantID' => $object->participant_id,
         'name' => $object->name,
-        'email' => $object->email,
-        'status' => CRM_Utils_Array::value($object->status_id,
-          $statusLookup
-        ),
+        'status' => $status,
         'date' => $object->register_date,
       );
       $rows[] = $row;