From ec07e220ad2cec4a2249638eabbdfeb75560f68b Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 1 Oct 2010 18:32:47 +0000
Subject: [PATCH] Remove wordpressmu_wp_mail_from(). fixes #14586

git-svn-id: http://svn.automattic.com/wordpress/trunk@15678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-default-filters.php | 1 -
 wp-includes/ms-functions.php       | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php
index 9c978fcc4..de1ce0739 100644
--- a/wp-includes/ms-default-filters.php
+++ b/wp-includes/ms-default-filters.php
@@ -47,7 +47,6 @@ add_filter( 'upload_mimes', 'check_upload_mimes' );
 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
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 08153be9e..1468621d3 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1372,12 +1372,6 @@ function upload_is_file_too_big( $upload ) {
 	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}' />";