Validation - End date should be after event's start date

diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php
index a13462a9b71ad6d008bef943a8aa07282149d195..d401f096b3009ded669a4be601e9ef791c1779a1 100644 (file)
--- a/CRM/Core/Form/RecurringEntity.php
+++ b/CRM/Core/Form/RecurringEntity.php
@@ -146,11 +146,10 @@ class CRM_Core_Form_RecurringEntity {
       }
       if($values['ends'] == 2){
         if ($values['repeat_absolute_date'] != "") {
-          $today = date("Y-m-d H:i:s"); 
-          $today = CRM_Utils_Date::processDate($today);
+          $eventStartDate = CRM_Utils_Date::processDate($values['repetition_start_date']);
           $end = CRM_Utils_Date::processDate($values['repeat_absolute_date']);
-          if (($end <= $today) && ($end != 0)) {
-            $errors['repeat_absolute_date'] = ts('End date should be after today\'s date');
+          if (($end < $eventStartDate) && ($end != 0)) {
+            $errors['repeat_absolute_date'] = ts('End date should be after event\'s start date');
           }
         }else{
           $errors['repeat_absolute_date'] = ts('This is a required field');