Merge branch 'JohnFF-patch-1'

Conflicts:
	CRM/Event/BAO/Participant.php

diff --cc CRM/Event/BAO/Participant.php
index bc959413a0317f071f50d23a482b97d80f34222b,605338e345dc4ff8f43c2e5dd4a6ba0544dd3a05..db7e7a57902adc35fa70424c17e266fc76be58f8
--- 1/CRM/Event/BAO/Participant.php
--- 2/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@@ -969,10 -949,11 +969,9 @@@ WHERE  civicrm_participant.id = {$parti
      if ((substr($eventLevel, 0, 1) == CRM_Core_DAO::VALUE_SEPARATOR) &&
        (substr($eventLevel, -1, 1) == CRM_Core_DAO::VALUE_SEPARATOR)
      ) {
--      $eventLevel = implode(', ', explode(CRM_Core_DAO::VALUE_SEPARATOR,
--          substr($eventLevel, 1, -1)
--        ));
-       if ($pos = strrpos($eventLevel, '(multiple participants)', 0)) {
++      $eventLevel = implode(', ', explode(CRM_Core_DAO::VALUE_SEPARATOR, substr($eventLevel, 1, -1)));
+       $pos = strrpos($eventLevel, '(multiple participants)', 0);
+       if ($pos) {
          $eventLevel = substr_replace($eventLevel, "", $pos - 3, 1);
        }
      }
@@@ -1465,8 -1430,9 +1464,8 @@@ UPDATE  civicrm_participan
      ) {
        return $mailSent;
      }
--
-     if ($toEmail = CRM_Utils_Array::value('email', $contactDetails)) {
+     $toEmail = CRM_Utils_Array::value('email', $contactDetails);
+     if ($toEmail) {
  
        $contactId = $participantValues['contact_id'];
        $participantName = $contactDetails['display_name'];