From: Tim Otten <totten@civicrm.org>
Date: Tue, 23 Apr 2013 22:20:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=de1298369755f3e22e6d603e49def94578f18384;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29

Conflicts:
	CRM/Core/BAO/ActionSchedule.php
	sql/civicrm_generated.mysql
	xml/version.xml
---

de1298369755f3e22e6d603e49def94578f18384
diff --cc CRM/Case/XMLProcessor/Report.php
index 50bdb6f6d6,6bcb2d4d05..572b12be3e
--- a/CRM/Case/XMLProcessor/Report.php
+++ b/CRM/Case/XMLProcessor/Report.php
@@@ -319,11 -300,10 +307,10 @@@ WHERE      a.id = %
      if (!empty($activityDAO->targetID)) {
        // Re-lookup the target ID since the DAO only has the first recipient if there are multiple.
        // Maybe not the best solution.
 -      $targetNames   = CRM_Activity_BAO_ActivityTarget::getTargetNames($activityDAO->id);
 +      $targetNames   = CRM_Activity_BAO_ActivityContact::getNames($activityDAO->id, $targetID);
        $processTarget = FALSE;
        $label         = ts('With Contact(s)');
-       if (in_array($activityTypeInfo['name'], array(
-         'Email', 'Inbound Email'))) {
+       if (in_array($activityTypeInfo['name'], array('Email', 'Inbound Email'))) {
          $processTarget = TRUE;
          $label = ts('Recipient');
        }
diff --cc CRM/Core/BAO/ActionSchedule.php
index 4470dd3a93,f204b740cf..074c7633d9
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@@ -844,12 -840,12 +844,12 @@@ WHERE reminder.action_schedule_id = %1 
            $where[] = "e.membership_type_id IS NULL";
          }
  
-         $where[] = "e.is_override IS NULL OR e.is_override = 0";
+         $where[] = "( e.is_override IS NULL OR e.is_override = 0 )";
          $dateField = str_replace('membership_', 'e.', $actionSchedule->start_action_date);
          $notINClause = self::permissionedRelationships($contactField);
 -        
 +
-         $memershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, "is_current_member = 1", 'id');
-         $mStatus = implode (',', $memershipStatus);
+         $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, "is_current_member = 1 OR name = 'Expired'", 'id');
+         $mStatus = implode (',', $membershipStatus);
          $where[] = "e.status_id IN ({$mStatus})";
  
        }