diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/ms-default-filters.php --- a/wp/wp-includes/ms-default-filters.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-includes/ms-default-filters.php Mon Oct 14 18:28:13 2019 +0200 @@ -27,9 +27,9 @@ add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 ); add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 ); add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 ); -add_action( 'network_site_new_created_user', 'wp_send_new_user_notifications' ); +add_action( 'network_site_new_created_user', 'wp_send_new_user_notifications' ); 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_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' ); add_filter( 'sanitize_user', 'strtolower' ); // Roles @@ -37,10 +37,34 @@ // Blogs add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' ); -add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 ); -add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 ); add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 ); add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 ); +add_filter( 'wp_normalize_site_data', 'wp_normalize_site_data', 10, 1 ); +add_action( 'wp_validate_site_data', 'wp_validate_site_data', 10, 3 ); +add_action( 'wp_insert_site', 'wp_maybe_update_network_site_counts_on_update', 10, 1 ); +add_action( 'wp_update_site', 'wp_maybe_update_network_site_counts_on_update', 10, 2 ); +add_action( 'wp_delete_site', 'wp_maybe_update_network_site_counts_on_update', 10, 1 ); +add_action( 'wp_insert_site', 'wp_maybe_transition_site_statuses_on_update', 10, 1 ); +add_action( 'wp_update_site', 'wp_maybe_transition_site_statuses_on_update', 10, 2 ); +add_action( 'wp_update_site', 'wp_maybe_clean_new_site_cache_on_update', 10, 2 ); +add_action( 'wp_initialize_site', 'wp_initialize_site', 10, 2 ); +add_action( 'wp_initialize_site', 'wpmu_log_new_registrations', 100, 2 ); +add_action( 'wp_initialize_site', 'newblog_notify_siteadmin', 100, 1 ); +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 +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' ); +add_filter( 'get_blog_metadata', 'wp_check_site_meta_support_prefilter' ); +add_filter( 'add_blog_metadata', 'wp_check_site_meta_support_prefilter' ); +add_filter( 'update_blog_metadata', 'wp_check_site_meta_support_prefilter' ); +add_filter( 'delete_blog_metadata', 'wp_check_site_meta_support_prefilter' ); +add_filter( 'get_blog_metadata_by_mid', 'wp_check_site_meta_support_prefilter' ); +add_filter( 'update_blog_metadata_by_mid', 'wp_check_site_meta_support_prefilter' ); +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 add_action( 'signup_hidden_fields', 'signup_nonce_fields' ); @@ -57,12 +81,14 @@ add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 ); // Counts -add_action( 'admin_init', 'wp_schedule_update_network_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 ) +foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action ) { add_action( $action, 'wp_maybe_update_network_user_counts', 10, 0 ); -foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action ) +} +foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action ) { add_action( $action, 'wp_maybe_update_network_site_counts', 10, 0 ); +} unset( $action ); // Files @@ -77,21 +103,23 @@ // 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 remove_filter( 'option_siteurl', '_config_wp_siteurl' ); -remove_filter( 'option_home', '_config_wp_home' ); +remove_filter( 'option_home', '_config_wp_home' ); // Some options changes should trigger site details refresh. -add_action( 'update_option_blogname', 'clean_site_details_cache', 10, 0 ); -add_action( 'update_option_siteurl', 'clean_site_details_cache', 10, 0 ); +add_action( 'update_option_blogname', 'clean_site_details_cache', 10, 0 ); +add_action( 'update_option_siteurl', 'clean_site_details_cache', 10, 0 ); add_action( 'update_option_post_count', 'clean_site_details_cache', 10, 0 ); -add_action( 'update_option_home', 'clean_site_details_cache', 10, 0 ); +add_action( 'update_option_home', 'clean_site_details_cache', 10, 0 ); // 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' );