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

diff --cc CRM/Core/BAO/ActionSchedule.php
index 074c7633d94e4614f9c3cb92313c4f408bbcd157,1d23622c19be4398cc8f141b459ea56db9783812..199641fd74aed0ba645f6dc1338073b209cc58a5
--- 1/CRM/Core/BAO/ActionSchedule.php
--- 2/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/Job.php
Simple merge

diff --cc CRM/Mailing/BAO/Mailing.php
index 6ab9939a58e711da16341ae768b69f4a3308b74d,921ab621d171a03e2c1a72b3653455f4e5adc03b..3a73be414726f27cb1527569427f350c166a5703
--- 1/CRM/Mailing/BAO/Mailing.php
--- 2/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]);

diff --cc templates/CRM/Contact/Form/NewContact.tpl
Simple merge