Make WordPress Core

Ticket #17890: 17890.diff

File 17890.diff, 854 bytes (added by kawauso, 13 years ago)

No is_email(), move sanitize_email() later

  • wp-admin/network/site-new.php

     
    4444                        wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
    4545        }
    4646
    47         $email = sanitize_email( $blog['email'] );
     47        $email = $blog['email'];
    4848        $title = $blog['title'];
    4949
    5050        if ( empty( $domain ) )
    5151                wp_die( __( 'Missing or invalid site address.' ) );
    5252        if ( empty( $email ) )
    5353                wp_die( __( 'Missing email address.' ) );
    54         if ( !is_email( $email ) )
     54        if ( ! ( $email = sanitize_email( $email ) ) )
    5555                wp_die( __( 'Invalid email address.' ) );
    5656
    5757        if ( is_subdomain_install() ) {