From 8095f6e62756de83a9b252a61a1ae4ca2812fc87 Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Sat, 19 Jan 2019 21:29:14 -0500
Subject: [PATCH] Enable smartblocks with same criteria to stay separate if
 created with new criteria

---
 airtime_mvc/application/models/Block.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 528cab82d..3bf1c0dcc 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1641,9 +1641,12 @@ SQL;
                             Logging::info('adding and');
                             $qry->addAnd($spCriteria, $spCriteriaValue, $spCriteriaModifier);
                         }
+                        // only add this NOT LIKE null if you aren't also matching on another criteria
+                        if ($i == 0) {
                         if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) {
                             $qry->addOr($spCriteria, null, Criteria::ISNULL);
                         }
+                        }
                     } catch (Exception $e) {
                         Logging::info($e);
                     }