Changes from trunk/wp-includes/pluggable.php at r6145 to branches/2.3/wp-includes/pluggable.php at r6266

File:

• branches/2.3/wp-includes/pluggable.php (modified) (2 diffs)

branches/2.3/wp-includes/pluggable.php

@@ -226 +226 @@
     // Set the from name and email
     $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
+    $phpmailer->Sender = apply_filters( 'wp_mail_from', $from_email );
     $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
 
@@ -437 +438 @@
     $allowed_hosts = (array) apply_filters('allowed_redirect_hosts', array($wpp['host']), $lp['host']);
 
-    if ( isset($lp['host']) && !in_array($lp['host'], $allowed_hosts) )
+    if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
         $location = get_option('siteurl') . '/wp-admin/';