diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 5de4e0669..b758bc96f 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -81,7 +81,7 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category - +

%s, %s, %s.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?>

diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php index cabace17f..a1dc1f565 100644 --- a/wp-includes/ms-default-filters.php +++ b/wp-includes/ms-default-filters.php @@ -39,4 +39,5 @@ add_action( 'phpmailer_init', 'fix_phpmailer_messageid' ); // Disable somethings by default for multisite add_filter( 'enable_update_services_configuration', '__return_false' ); +add_filter( 'enable_post_by_email_configuration', '__return_false' ); ?>