Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 22:35:02 +02:00
Code Issues Projects Releases Wiki Activity

Remove wordpressmu_wp_mail_from(). fixes #14586

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-10-01 18:32:47 +00:00
parent 0449fee5da
commit ec07e220ad
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/ms-default-filters.php
View File

@ -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

6
wp-includes/ms-functions.php
View File

@ -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}' />";