From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Fri, 18 Mar 2016 13:15:16 +0000 (+0530)
Subject: CRM-18250 - Fix Find Events on Manage Event Screen
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=78fde01215e6635d6c7bb2ba0e309b498c256167;p=civicrm-core.git

CRM-18250 - Fix Find Events on Manage Event Screen

update doc
---

diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 3c58fd5e62..1746505ae4 100644
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -467,16 +467,22 @@ 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)) {
-          $clauses[] = '( start_date >= %3 OR start_date IS NULL )';
+          $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) )";
           $params[3] = array($from, 'String');
         }
 
-        $to = $this->get('end_date');
         if (!CRM_Utils_System::isNull($to)) {
-          $clauses[] = '( end_date <= %4 OR end_date IS NULL )';
+          $clauses[] = "(($start start_date <= %4))";
           $params[4] = array($to, 'String');
         }
       }