Ticket #14586: 14586.diff

wp-includes/ms-default-filters.php

@@ -47 +47 @@
 add_filter( 'upload_size_limit', 'upload_size_limit_filter' );
 
 // Mail
-add_filter( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
 add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
 
 // Disable somethings by default for multisite

wp-includes/ms-functions.php

@@ -1245 +1245 @@
         return $upload;
 }
 
-function wordpressmu_wp_mail_from( $email ) {
-        if ( strpos( $email, 'wordpress@' ) !== false )
-                $email = get_option( 'admin_email' );
-        return $email;
-}
-
 function signup_nonce_fields() {
         $id = mt_rand();
         echo "<input type='hidden' name='signup_form_id' value='{$id}' />";