Merge pull request #1707 from lcdservices/CRM-13455

CRM-13455 improve getEvents query to account for empty end_date

CRM/Event/BAO/Event.php

@@ -279,7 +279,12 @@ WHERE  ( civicrm_event.is_template IS NULL OR civicrm_event.is_template = 0 )";
     elseif ($all == 0) {
       // find only events ending in the future
       $endDate = date('YmdHis');
-      $query .= " AND ( `end_date` >= {$endDate} OR end_date IS NULL )";
+      $query .= "
+        AND ( `end_date` >= {$endDate} OR
+          (
+            ( end_date IS NULL OR end_date = '' ) AND start_date >= {$endDate}
+          )
+        )";
     }
     elseif ($all == 2) {
       // find only events starting in the last 3 months