From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 1 May 2013 21:15:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-14-11-47
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3ad735b477e8ef80caf5b68954eb678ac474c974;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-14-11-47

Conflicts:
	CRM/Core/BAO/ActionSchedule.php
	CRM/Mailing/BAO/Mailing.php
---

3ad735b477e8ef80caf5b68954eb678ac474c974
diff --cc CRM/Core/BAO/ActionSchedule.php
index 074c7633d9,1d23622c19..199641fd74
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@@ -847,8 -843,8 +847,8 @@@ WHERE reminder.action_schedule_id = %1 
          $where[] = "( e.is_override IS NULL OR e.is_override = 0 )";
          $dateField = str_replace('membership_', 'e.', $actionSchedule->start_action_date);
          $notINClause = self::permissionedRelationships($contactField);
 -        
 +
-         $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, "is_current_member = 1 OR name = 'Expired'", 'id');
+         $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/Mailing.php
index 6ab9939a58,921ab621d1..3a73be4147
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@@ -1306,11 -1306,10 +1306,10 @@@ ORDER BY   civicrm_email.is_bulkmail DE
     * domain and mailing tokens
     *
     */
 -  static function tokenReplace(&$mailing) {
 +  public static function tokenReplace(&$mailing) {
      $domain = CRM_Core_BAO_Domain::getDomain();
  
-     foreach (array(
-       'text', 'html') as $type) {
+     foreach (array('text', 'html') as $type) {
        $tokens = $mailing->getTokens();
        if (isset($mailing->templates[$type])) {
          $mailing->templates[$type] = CRM_Utils_Token::replaceSubscribeInviteTokens($mailing->templates[$type]);