My updated functions_email.php has these pieces of extra code that are not in the original 1.3.7.1 version
if ($module == 'resend') {
$email_html=''; // just blank out the html portion if resend from admin
while (strstr($email_text, ' ')) $email_text = str_replace(' ', ' ', $email_text);
}
AND
//following lines are inserted to take disclaimed, span. extra info and copyright off the bottom of the admin HTML emails
if ($module == 'checkout_extra') {
$block['EMAIL_FOOTER_COPYRIGHT'] = '';
$block['EMAIL_DISCLAIMER'] = '';
$block['EMAIL_SPAM_DISCLAIMER'] = '';
$block['EXTRA_INFO'] = '';
}
AND (checkout_extra is added in 2 places below)
// set the reply-to address. If none set yet, then use Store's default email name/address.
// If sending from contact-us or tell-a-friend page, use the supplied info
$email_reply_to_address = ($email_reply_to_address) ? $email_reply_to_address : (in_array($module, array('contact_us', 'tell_a_friend', 'checkout_extra')) ? $from_email_address : EMAIL_FROM);
$email_reply_to_name = ($email_reply_to_name) ? $email_reply_to_name : (in_array($module, array('contact_us', 'tell_a_friend', 'checkout_extra')) ? $from_email_name : STORE_NAME);
$mail->AddReplyTo($email_reply_to_address, $email_reply_to_name);
Jeff Michaels,
pres of Musical Creations Ltd.