Changeset 15678

Timestamp:

10/01/2010 06:32:47 PM (14 years ago)

Author:

ryan

Message:

Remove wordpressmu_wp_mail_from(). fixes #14586

Location:

trunk/wp-includes

Files:

• ms-default-filters.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-default-filters.php

@@ -48 +48 @@
 
 // Mail
-add_filter( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
 add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
 

trunk/wp-includes/ms-functions.php

@@ -1373 +1373 @@
 }
 
-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();