Ticket #25239: pluggable.php.2.diff

325,331c325,326
<               // Get the site domain and get rid of www.
<               $sitename = strtolower( $_SERVER['SERVER_NAME'] );
<               if ( substr( $sitename, 0, 4 ) == 'www.' ) {
<                       $sitename = substr( $sitename, 4 );
<               }
<
<               $from_email = 'wordpress@' . $sitename;
---
>               $dom = parse_url( get_home_url( get_current_blog_id() ), PHP_URL_HOST );
>               $from_email = 'wordpress@' . preg_replace("/^.*?([^\.]+)\.([^\.]+)$/", "$1.$2", $dom);
333a329
>