minor fix

diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 1746505ae457c9d17da92719252ec0013e0b9a04..1a6277e773ee7c6c39164f561daff9ef6e64f531 100644 (file)
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -467,22 +467,16 @@ ORDER BY start_date desc
     $eventsByDates = $this->get('eventsByDates');
     if ($this->_searchResult) {
       if ($eventsByDates) {
+
         $from = $this->get('start_date');
-        $to = $this->get('end_date');
-        $start = $end = '';
         if (!CRM_Utils_System::isNull($from)) {
-          $start = 'end_date >= %3 AND';
-          if (!CRM_Utils_System::isNull($to)) {
-            $end = ' AND start_date <= %4 ';
-          }
-          // CRM-18250 - search end_date greater than $from or start_date should be
-          // greater than $from in case end_date is NULL to get proper event result.
-          $clauses[] = "( (end_date >= %3 $end ) OR (start_date >= %3 AND end_date IS NULL) )";
+          $clauses[] = '( end_date >= %3 OR end_date IS NULL )';
           $params[3] = array($from, 'String');
         }
 
+        $to = $this->get('end_date');
         if (!CRM_Utils_System::isNull($to)) {
-          $clauses[] = "(($start start_date <= %4))";
+          $clauses[] = '( start_date <= %4 OR start_date IS NULL )';
           $params[4] = array($to, 'String');
         }
       }