diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/ms-default-filters.php --- a/wp/wp-includes/ms-default-filters.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/ms-default-filters.php Tue Dec 15 13:49:49 2020 +0100 @@ -15,12 +15,12 @@ add_action( 'init', 'ms_subdomain_constants' ); -// Functions +// Functions. add_action( 'update_option_blog_public', 'update_blog_public', 10, 2 ); add_filter( 'option_users_can_register', 'users_can_register_signup_filter' ); add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' ); -// Users +// Users. add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' ); add_action( 'init', 'maybe_add_existing_user_to_blog' ); add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' ); @@ -31,11 +31,12 @@ add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' ); add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' ); add_filter( 'sanitize_user', 'strtolower' ); +add_action( 'deleted_user', 'wp_delete_signup_on_user_delete', 10, 3 ); -// Roles +// Roles. add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 ); -// Blogs +// Blogs. add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' ); add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 ); add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 ); @@ -53,7 +54,7 @@ add_action( 'wp_uninitialize_site', 'wp_uninitialize_site', 10, 1 ); add_action( 'update_blog_public', 'wp_update_blog_public_option_on_site_update', 1, 2 ); -// Site meta +// Site meta. add_action( 'added_blog_meta', 'wp_cache_set_sites_last_changed' ); add_action( 'updated_blog_meta', 'wp_cache_set_sites_last_changed' ); add_action( 'deleted_blog_meta', 'wp_cache_set_sites_last_changed' ); @@ -66,21 +67,21 @@ add_filter( 'delete_blog_metadata_by_mid', 'wp_check_site_meta_support_prefilter' ); add_filter( 'update_blog_metadata_cache', 'wp_check_site_meta_support_prefilter' ); -// Register Nonce +// Register nonce. add_action( 'signup_hidden_fields', 'signup_nonce_fields' ); -// Template +// Template. add_action( 'template_redirect', 'maybe_redirect_404' ); add_filter( 'allowed_redirect_hosts', 'redirect_this_site' ); -// Administration +// Administration. add_filter( 'term_id_filter', 'global_terms', 10, 2 ); add_action( 'delete_post', '_update_posts_count_on_delete' ); add_action( 'delete_post', '_update_blog_date_on_post_delete' ); add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 ); add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 ); -// Counts +// Counts. add_action( 'admin_init', 'wp_schedule_update_network_counts' ); add_action( 'update_network_counts', 'wp_update_network_counts', 10, 0 ); foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action ) { @@ -91,27 +92,27 @@ } unset( $action ); -// Files +// Files. add_filter( 'wp_upload_bits', 'upload_is_file_too_big' ); add_filter( 'import_upload_size_limit', 'fix_import_form_size' ); add_filter( 'upload_mimes', 'check_upload_mimes' ); add_filter( 'upload_size_limit', 'upload_size_limit_filter' ); add_action( 'upload_ui_over_quota', 'multisite_over_quota_message' ); -// Mail +// Mail. add_action( 'phpmailer_init', 'fix_phpmailer_messageid' ); -// Disable somethings by default for multisite +// Disable somethings by default for multisite. add_filter( 'enable_update_services_configuration', '__return_false' ); -if ( ! defined( 'POST_BY_EMAIL' ) || ! POST_BY_EMAIL ) { // back compat constant. +if ( ! defined( 'POST_BY_EMAIL' ) || ! POST_BY_EMAIL ) { // Back compat constant. add_filter( 'enable_post_by_email_configuration', '__return_false' ); } -if ( ! defined( 'EDIT_ANY_USER' ) || ! EDIT_ANY_USER ) { // back compat constant. +if ( ! defined( 'EDIT_ANY_USER' ) || ! EDIT_ANY_USER ) { // Back compat constant. add_filter( 'enable_edit_any_user_configuration', '__return_false' ); } add_filter( 'force_filtered_html_on_import', '__return_true' ); -// WP_HOME and WP_SITEURL should not have any effect in MS +// WP_HOME and WP_SITEURL should not have any effect in MS. remove_filter( 'option_siteurl', '_config_wp_siteurl' ); remove_filter( 'option_home', '_config_wp_home' ); @@ -124,5 +125,5 @@ // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used. add_filter( 'default_site_option_ms_files_rewriting', '__return_true' ); -// Whitelist multisite domains for HTTP requests +// Allow multisite domains for HTTP requests. add_filter( 'http_request_host_is_external', 'ms_allowed_http_request_hosts', 20, 2 );