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

diff --cc CRM/Activity/BAO/Activity.php
Simple merge

diff --cc CRM/Campaign/BAO/Query.php
Simple merge

diff --cc CRM/Case/XMLProcessor/Report.php
index 50bdb6f6d6c48fb3593819632ea774475b0b350a,6bcb2d4d05dce5e5518e871966934f32609e319f..572b12be3e38eec1854fd63c3eabfe9e8baa11ec
--- 1/CRM/Case/XMLProcessor/Report.php
--- 2/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/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Contact/Form/Task/SMSCommon.php
Simple merge

diff --cc CRM/Core/BAO/ActionSchedule.php
index 4470dd3a93db7d035d61e41f3ab767a228cbf186,f204b740cf3e742ecb375d188fa2b95863465c96..074c7633d94e4614f9c3cb92313c4f408bbcd157
--- 1/CRM/Core/BAO/ActionSchedule.php
--- 2/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})";
  
        }

diff --cc CRM/Mailing/BAO/Job.php
Simple merge

diff --cc css/civicrm.css
Simple merge

diff --cc templates/CRM/Activity/Form/Activity.tpl
Simple merge