Remove wordpressmu_wp_mail_from(). fixes #14586
git-svn-id: http://svn.automattic.com/wordpress/trunk@15678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
0449fee5da
commit
ec07e220ad
|
@ -47,7 +47,6 @@ add_filter( 'upload_mimes', 'check_upload_mimes' );
|
||||||
add_filter( 'upload_size_limit', 'upload_size_limit_filter' );
|
add_filter( 'upload_size_limit', 'upload_size_limit_filter' );
|
||||||
|
|
||||||
// Mail
|
// Mail
|
||||||
add_filter( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
|
|
||||||
add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
|
add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
|
||||||
|
|
||||||
// Disable somethings by default for multisite
|
// Disable somethings by default for multisite
|
||||||
|
|
|
@ -1372,12 +1372,6 @@ function upload_is_file_too_big( $upload ) {
|
||||||
return $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() {
|
function signup_nonce_fields() {
|
||||||
$id = mt_rand();
|
$id = mt_rand();
|
||||||
echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
|
echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
|
||||||
|
|
Loading…
Reference in New Issue