From 8db05db813ab2b6094726c300b624d458ce85af0 Mon Sep 17 00:00:00 2001
From: Allen Shaw <allen@JoineryHQ.com>
Date: Mon, 10 Jul 2017 11:21:10 -0500
Subject: [PATCH] CRM-20509: CiviReport: ACL limits in WHERE were too
 restrictive.

---
 CRM/Core/DAO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index b1bf5ba765..64a12572f0 100644
--- 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;
-- 
2.25.1