CRM-15564: Event info page shows past event Closed with Active Registration Windows

----------------------------------------
* CRM-15564: Event info page shows past event Closed with Active Registration Windows
  https://issues.civicrm.org/jira/browse/CRM-15564

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 9a4f3d2aaf9b9c4e9fc296463ebffdb23d0e8f96..998e1e83922b045006d65d2a4c0a8490aef9ad7e 100644 (file)
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -1923,10 +1923,7 @@ WHERE  ce.loc_block_id = $locBlockId";
     if ($startDate && $startDate >= $now) {
       $validDate = FALSE;
     }
-    if ($endDate && $endDate < $now) {
-      $validDate = FALSE;
-    }
-    if ($eventEnd && $eventEnd < $now) {
+    if ($endDate && $endDate < $now && $eventEnd && $eventEnd < $now) {
       $validDate = FALSE;
     }
 

diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php
index 8538460866df20984f288631828a700429d5446d..ff49b532fedd2a98df18e47ad3cafc2070e2204b 100644 (file)
--- a/CRM/Event/Form/Registration.php
+++ b/CRM/Event/Form/Registration.php
@@ -1515,15 +1515,9 @@ WHERE  v.option_group_id = g.id
       $this->_values['event']
     ));
     $eventEndDate = CRM_Utils_Date::processDate(CRM_Utils_Array::value('event_end_date', $this->_values['event']));
-    if (
-      $endDate &&
-      $endDate < $now
-    ) {
+    if ($endDate && ($endDate < $now) && !empty($eventEndDate) && ($eventEndDate < $now)) {
       CRM_Core_Error::statusBounce(ts('Registration for this event ended on %1', array(1 => CRM_Utils_Date::customFormat(CRM_Utils_Array::value('registration_end_date', $this->_values['event'])))), $redirect);
     }
-    if (!empty($eventEndDate) && $eventEndDate < $now) {
-      CRM_Core_Error::statusBounce(ts('Event ended on %1', array(1 => CRM_Utils_Date::customFormat(CRM_Utils_Array::value('event_end_date', $this->_values['event'])))), $redirect);
-    }
   }
 
 }