From: Francis Whittle <francis@agileware.com.au>
Date: Fri, 22 Apr 2016 05:11:53 +0000 (+1000)
Subject: CRM-18356: Fix incorrect logic Activity Report has when excluding NULL / NOT NULL... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=024311d5871fd7700b641a21c38392dbf02028ed;p=civicrm-core.git

CRM-18356: Fix incorrect logic Activity Report has when excluding NULL / NOT NULL filters in 'where' method.

----------------------------------------
* CRM-18356: Activity Reports show null Target Name fields incorrectly for some Activities
  https://issues.civicrm.org/jira/browse/CRM-18356
---

diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
index 7a9372a15e..67c4269f71 100644
--- a/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@ -580,7 +580,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form {
           }
           else {
             $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
-            if ($op && ($op != 'nnll' || $op != 'nll')) {
+            if ($op && ($op != 'nnll' && $op != 'nll')) {
               $clause = $this->whereClause($field,
                 $op,
                 CRM_Utils_Array::value("{$fieldName}_value", $this->_params),