CRM-20509: CiviReport: ACL limits in WHERE were too restrictive.

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index b1bf5ba765e53429e82b3114f722565a21e23fab..64a12572f0940ad57272f92b18500007d4e6b28d 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2527,7 +2527,7 @@ SELECT contact_id
     foreach ((array) $bao->addSelectWhereClause() as $field => $vals) {
       $clauses[$field] = NULL;
       if ($vals) {
-        $clauses[$field] = "`$tableAlias`.`$field` " . implode(" AND `$tableAlias`.`$field` ", (array) $vals);
+        $clauses[$field] = "(`$tableAlias`.`$field` IS NULL OR (`$tableAlias`.`$field` " . implode(" AND `$tableAlias`.`$field` ", (array) $vals) . '))';
       }
     }
     return $clauses;