From 845f5f05bb027d08e4c58da5b9996cf18eb5dec2 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 3 Oct 2014 17:54:46 -0700
Subject: [PATCH] CRM-11342 - Fix for correct filtering of permissioned
 employees.

----------------------------------------
* CRM-11342:
  https://issues.civicrm.org/jira/browse/CRM-11342

Conflicts:
	CRM/Core/BAO/ActionSchedule.php
---
 CRM/Core/BAO/ActionSchedule.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php
index b6ed98b42f..3aaf88c4e2 100755
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@ -1088,7 +1088,7 @@ GROUP BY c.id
 {$fromClause}
 {$joinClause}
 INNER JOIN {$reminderJoinClause}
-{$whereClause} {$limitWhereClause} AND {$repeatEventClause} $originalEventStartDateClause
+{$whereClause} {$limitWhereClause} AND {$repeatEventClause} {$notINClause} $originalEventStartDateClause
 {$groupByClause}
 {$havingClause}";
 
@@ -1157,10 +1157,10 @@ WHERE     m.owner_membership_id IS NOT NULL AND
     $excludeIds = array();
     $dao = CRM_Core_DAO::executeQuery($query, array());
     while ($dao->fetch()) {
-      if ($dao->slave_contact == $dao->contact_id_a && $dao->is_permission_b_a == 0) {
+      if ($dao->slave_contact == $dao->contact_id_a && $dao->is_permission_a_b == 0) {
         $excludeIds[] = $dao->slave_contact;
       }
-      elseif ($dao->slave_contact == $dao->contact_id_b && $dao->is_permission_a_b == 0) {
+      elseif ($dao->slave_contact == $dao->contact_id_b && $dao->is_permission_b_a == 0) {
         $excludeIds[] = $dao->slave_contact;
       }
     }
-- 
2.25.1